summaryrefslogtreecommitdiff
path: root/net/rxrpc/sendmsg.c
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2020-08-04 10:58:32 +0300
committerJoel Stanley <joel@jms.id.au>2020-08-04 10:58:36 +0300
commit9524588381df213554a10d3661a9200a4b7f6db2 (patch)
treea4d281b99dcd28b9a1d3077299c26a5671abff88 /net/rxrpc/sendmsg.c
parent666e403461fd046b37bc95bba49e82ca6a758bea (diff)
parent67da9e2c2b730b9b788ace749d22d769cf11ee2b (diff)
downloadlinux-dev-5.7.tar.xz
Merge tag 'v5.7.12' into dev-5.7dev-5.7
This is the 5.7.12 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'net/rxrpc/sendmsg.c')
-rw-r--r--net/rxrpc/sendmsg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c
index 5e9c43d4a314..49d03c8c64da 100644
--- a/net/rxrpc/sendmsg.c
+++ b/net/rxrpc/sendmsg.c
@@ -306,7 +306,7 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,
/* this should be in poll */
sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);
- if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
+ if (sk->sk_shutdown & SEND_SHUTDOWN)
return -EPIPE;
more = msg->msg_flags & MSG_MORE;