diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-21 01:29:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-21 01:29:08 -0400 |
| commit | 9f6ec8d697c08963d83880ccd35c13c5ace716ea (patch) | |
| tree | ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2 /net/ipv6/tcp_ipv6.c | |
| parent | 4aa3a715551c93eda32d79bd52042ce500bd5383 (diff) | |
| parent | 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index a1ef61a889c3..78aa53492b3e 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -1649,6 +1649,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) | |||
| 1649 | * the new socket.. | 1649 | * the new socket.. |
| 1650 | */ | 1650 | */ |
| 1651 | if(nsk != sk) { | 1651 | if(nsk != sk) { |
| 1652 | sock_rps_save_rxhash(nsk, skb->rxhash); | ||
| 1652 | if (tcp_child_process(sk, nsk, skb)) | 1653 | if (tcp_child_process(sk, nsk, skb)) |
| 1653 | goto reset; | 1654 | goto reset; |
| 1654 | if (opt_skb) | 1655 | if (opt_skb) |