aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2010-04-21 03:47:15 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-12 18:02:57 -0400
commit9a537dc8a33eb48eb5a6a2fdc5ced5251295b3ea (patch)
tree1374ca4df0331081d09eefa515017a8bb10886ea /net
parent3aae65db0819a8f6bb440e12868986fc3891e96e (diff)
ipv6: Fix tcp_v6_send_response transport header setting.
[ Upstream commit 6651ffc8e8bdd5fb4b7d1867c6cfebb4f309512c ] My recent patch to remove the open-coded checksum sequence in tcp_v6_send_response broke it as we did not set the transport header pointer on the new packet. Actually, there is code there trying to set the transport header properly, but it sets it for the wrong skb ('skb' instead of 'buff'). This bug was introduced by commit a8fdf2b331b38d61fb5f11f3aec4a4f9fb2dedcb ("ipv6: Fix tcp_v6_send_response(): it didn't set skb transport header") Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/tcp_ipv6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 548a06e66b4e..d2ef3a39dff4 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1006,7 +1006,7 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,
1006 skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len); 1006 skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len);
1007 1007
1008 t1 = (struct tcphdr *) skb_push(buff, tot_len); 1008 t1 = (struct tcphdr *) skb_push(buff, tot_len);
1009 skb_reset_transport_header(skb); 1009 skb_reset_transport_header(buff);
1010 1010
1011 /* Swap the send and the receive. */ 1011 /* Swap the send and the receive. */
1012 memset(t1, 0, sizeof(*t1)); 1012 memset(t1, 0, sizeof(*t1));