aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-01-05 00:59:00 -0800
committerDavid S. Miller <davem@davemloft.net>2009-01-05 00:59:00 -0800
commit7945cc6464a4db0caf6dfacdfe05806051c4cb7b (patch)
tree8bcd5f9cb276229f1b25844249a4243b6f95f656 /net
parent4f7d54f59bc470f0aaa932f747a95232d7ebf8b1 (diff)
downloadmrst-s0i3-test-7945cc6464a4db0caf6dfacdfe05806051c4cb7b.tar.gz
mrst-s0i3-test-7945cc6464a4db0caf6dfacdfe05806051c4cb7b.tar.xz
mrst-s0i3-test-7945cc6464a4db0caf6dfacdfe05806051c4cb7b.zip
tcp: Kill extraneous SPLICE_F_NONBLOCK checks.
In splice TCP receive, the SPLICE_F_NONBLOCK flag is used to compute the "timeo" value. So checking it again inside of the main receive loop to trigger -EAGAIN processing is entirely unnecessary. Noticed by Jarek P. and Lennert Buytenhek. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index bce1b068f2a..35bcddf8a93 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -597,10 +597,6 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,
ret = -ENOTCONN;
break;
}
- if (flags & SPLICE_F_NONBLOCK) {
- ret = -EAGAIN;
- break;
- }
if (!timeo) {
ret = -EAGAIN;
break;