diff options
author | Colin Cross <ccross@android.com> | 2011-06-29 13:54:42 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-06-29 13:54:42 -0700 |
commit | e55d4fa96762fd767a3b6d842c904e994db6bb2e (patch) | |
tree | c74157e01cb128cb97f106a50cfadc4c8b872c41 /net/ipv4/af_inet.c | |
parent | e32c14667e4fe9f16ac9b918d15d29abd2315a55 (diff) | |
parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) | |
download | kernel_samsung_crespo-e55d4fa96762fd767a3b6d842c904e994db6bb2e.zip kernel_samsung_crespo-e55d4fa96762fd767a3b6d842c904e994db6bb2e.tar.gz kernel_samsung_crespo-e55d4fa96762fd767a3b6d842c904e994db6bb2e.tar.bz2 |
Merge commit 'v3.0-rc5' into android-3.0
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r-- | net/ipv4/af_inet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 3af16ba..d4e5ade 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -693,6 +693,7 @@ int inet_accept(struct socket *sock, struct socket *newsock, int flags) lock_sock(sk2); + sock_rps_record_flow(sk2); WARN_ON(!((1 << sk2->sk_state) & (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT | TCPF_CLOSE))); |