diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-22 10:19:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-22 10:19:30 +0200 |
| commit | eff430de53be6f3328c3eebe93755f1ecf499e37 (patch) | |
| tree | c8e5ae958fe3e6656b4e96c83bbda17e649321a2 /net/ipv6/tcp_ipv6.c | |
| parent | 9cbdb702092a2d82f909312f4ec3eeded77bb82e (diff) | |
| parent | 91e8549bde9e5cc88c5a2e8c8114389279e240b5 (diff) | |
| download | talos-op-linux-eff430de53be6f3328c3eebe93755f1ecf499e37.tar.gz talos-op-linux-eff430de53be6f3328c3eebe93755f1ecf499e37.zip | |
Merge branch 'linus' into perf/core
Merge reason: Pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 56fa12538d45..4f49e5dd41bb 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1622,6 +1622,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) opt_skb = skb_clone(skb, GFP_ATOMIC); if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */ + sock_rps_save_rxhash(sk, skb->rxhash); if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) goto reset; if (opt_skb) @@ -1649,7 +1650,8 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) __kfree_skb(opt_skb); return 0; } - } + } else + sock_rps_save_rxhash(sk, skb->rxhash); if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb), skb->len)) goto reset; |
