diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-21 04:14:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-21 04:14:25 -0400 |
| commit | 87eb367003887cdc81a5d183efea227b5b488961 (patch) | |
| tree | 40f617e25a9364d573e3cd2189c9e7fa56c8a0fe /net/ipv6/tcp_ipv6.c | |
| parent | ccb7c7732e2ceb4e81a7806faf1670be9681ccd2 (diff) | |
| parent | 05d17608a69b3ae653ea5c9857283bef3439c733 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c
net/core/dev.c
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index a92b4a5cd8bf..78480f410a9b 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -1018,7 +1018,7 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win, | |||
| 1018 | skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len); | 1018 | skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len); |
| 1019 | 1019 | ||
| 1020 | t1 = (struct tcphdr *) skb_push(buff, tot_len); | 1020 | t1 = (struct tcphdr *) skb_push(buff, tot_len); |
| 1021 | skb_reset_transport_header(skb); | 1021 | skb_reset_transport_header(buff); |
| 1022 | 1022 | ||
| 1023 | /* Swap the send and the receive. */ | 1023 | /* Swap the send and the receive. */ |
| 1024 | memset(t1, 0, sizeof(*t1)); | 1024 | memset(t1, 0, sizeof(*t1)); |