diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:02:54 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:02:54 +0800 |
| commit | 0681158391fc57e4c164989b5b7d41565fddf7e2 (patch) | |
| tree | 3e9caae3705c2114d7c487afe60c0d09407c16c9 /net/ipv4/tcp_output.c | |
| parent | 4874c07664d8a52253ca73c8dd53bf13aeb61acb (diff) | |
| parent | 7166ceea0a4eba3f8c86925ad60e6f0543db6234 (diff) | |
Merge tag 'v3.18.84' into linux-linaro-lsk-v3.18lsk-v3.18-17.11
This is the 3.18.84 stable release
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index ff47e881e205..55da3338bfb2 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2911,13 +2911,8 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst, tcp_ecn_make_synack(req, th, sk); th->source = htons(ireq->ir_num); th->dest = ireq->ir_rmt_port; - /* Setting of flags are superfluous here for callers (and ECE is - * not even correctly set) - */ - tcp_init_nondata_skb(skb, tcp_rsk(req)->snt_isn, - TCPHDR_SYN | TCPHDR_ACK); - - th->seq = htonl(TCP_SKB_CB(skb)->seq); + skb->ip_summed = CHECKSUM_PARTIAL; + th->seq = htonl(tcp_rsk(req)->snt_isn); /* XXX data is queued and acked as is. No buffer/window check */ th->ack_seq = htonl(tcp_rsk(req)->rcv_nxt); |