ipv6: Fix tcp_v6_send_response transport header setting.
authorHerbert Xu <herbert@gondor.apana.org.au>
Wed, 21 Apr 2010 07:47:15 +0000 (00:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Apr 2010 07:47:15 +0000 (00:47 -0700)
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>
net/ipv6/tcp_ipv6.c

index c92ebe8f80d555c4ae9a54074f10faed3865cb22..075f540ec1975cdce6148e75661219cfe5decb6e 100644 (file)
@@ -1015,7 +1015,7 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,
        skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len);
 
        t1 = (struct tcphdr *) skb_push(buff, tot_len);
-       skb_reset_transport_header(skb);
+       skb_reset_transport_header(buff);
 
        /* Swap the send and the receive. */
        memset(t1, 0, sizeof(*t1));