Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Files removed in 'net-next' had their license header updated
in 'net'.  We take the remove from 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 7 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 822962ece284..b98b2f7f07e7 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -3257,13 +3257,8 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst,
         th->source = htons(ireq->ir_num);
         th->dest = ireq->ir_rmt_port;
         skb->mark = ireq->ir_mark;
-        /* 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);