diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-30 01:23:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-30 01:23:59 -0400 |
| commit | 6da49a292534d31ca391928ea97f8225774dc1e0 (patch) | |
| tree | 060c5f5f40dceb10d4528763bc7fc1ccc88210d9 /net/ipv6/tcp_ipv6.c | |
| parent | 17bdc6c0e979ae61879806e4dd93ec3b169d0931 (diff) | |
| parent | ca56a95eedcc95f8fea7b49c87565cd961d74fe2 (diff) | |
Merge remote branch 'origin/master' into next
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 d1fd28711ba5..87551ca568cd 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -1644,6 +1644,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) | |||
| 1644 | * the new socket.. | 1644 | * the new socket.. |
| 1645 | */ | 1645 | */ |
| 1646 | if(nsk != sk) { | 1646 | if(nsk != sk) { |
| 1647 | sock_rps_save_rxhash(nsk, skb->rxhash); | ||
| 1647 | if (tcp_child_process(sk, nsk, skb)) | 1648 | if (tcp_child_process(sk, nsk, skb)) |
| 1648 | goto reset; | 1649 | goto reset; |
| 1649 | if (opt_skb) | 1650 | if (opt_skb) |