diff options
author | Lennert Buytenhek <buytenh@marvell.com> | 2009-01-20 15:25:21 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-24 16:36:19 -0800 |
commit | d2552605f3b34253754c05ffd84a585514eecc62 (patch) | |
tree | a3869d65d3816cabf016032e7ab70e4d0775b18e /drivers | |
parent | d83217ac36ce6ed15c852970614371336f26f837 (diff) |
tcp: don't mask EOF and socket errors on nonblocking splice receive
[ Upstream commit: 4f7d54f59bc470f0aaa932f747a95232d7ebf8b1 ]
Currently, setting SPLICE_F_NONBLOCK on splice from a TCP socket
results in masking of EOF (RDHUP) and error conditions on the socket
by an -EAGAIN return. Move the NONBLOCK check in tcp_splice_read()
to be after the EOF and error checks to fix this.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions