diff options
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 850dc8f15afc..c4082cd50257 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -817,8 +817,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos, | |||
| 817 | * This occurs when user tries to read | 817 | * This occurs when user tries to read |
| 818 | * from never connected socket. | 818 | * from never connected socket. |
| 819 | */ | 819 | */ |
| 820 | if (!sock_flag(sk, SOCK_DONE)) | 820 | ret = -ENOTCONN; |
| 821 | ret = -ENOTCONN; | ||
| 822 | break; | 821 | break; |
| 823 | } | 822 | } |
| 824 | if (!timeo) { | 823 | if (!timeo) { |
| @@ -2042,13 +2041,10 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock, | |||
| 2042 | break; | 2041 | break; |
| 2043 | 2042 | ||
| 2044 | if (sk->sk_state == TCP_CLOSE) { | 2043 | if (sk->sk_state == TCP_CLOSE) { |
| 2045 | if (!sock_flag(sk, SOCK_DONE)) { | 2044 | /* This occurs when user tries to read |
| 2046 | /* This occurs when user tries to read | 2045 | * from never connected socket. |
| 2047 | * from never connected socket. | 2046 | */ |
| 2048 | */ | 2047 | copied = -ENOTCONN; |
| 2049 | copied = -ENOTCONN; | ||
| 2050 | break; | ||
| 2051 | } | ||
| 2052 | break; | 2048 | break; |
| 2053 | } | 2049 | } |
| 2054 | 2050 | ||