diff options
author | David S. Miller <davem@davemloft.net> | 2010-07-20 18:25:24 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-20 18:25:24 -0700 |
commit | 11fe883936980fe242869d671092a466cf1db3e3 (patch) | |
tree | 14ff24e81eb4326e94eb5aa6432a1dd55cef5ece /net/ipv4/tcp.c | |
parent | 70d4bf6d467a330ccc947df9b2608e329d9e7708 (diff) | |
parent | 573201f36fd9c7c6d5218cdcd9948cee700b277d (diff) | |
download | kernel_samsung_tuna-11fe883936980fe242869d671092a466cf1db3e3.zip kernel_samsung_tuna-11fe883936980fe242869d671092a466cf1db3e3.tar.gz kernel_samsung_tuna-11fe883936980fe242869d671092a466cf1db3e3.tar.bz2 |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/vhost/net.c
net/bridge/br_device.c
Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.
Revert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 9fce8a8..86b9f67 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -608,6 +608,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos, ssize_t spliced; int ret; + sock_rps_record_flow(sk); /* * We can't seek on a socket input */ |