diff options
| author | Ursula Braun <ubraun@linux.vnet.ibm.com> | 2018-01-24 10:28:17 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-24 10:52:57 -0500 |
| commit | aa377e682d0703452642d4059a94ab7fdaa90b89 (patch) | |
| tree | 9b8c9db6914f5b28249897b205df7dc6b91992f5 /net | |
| parent | bbb96bf2366e502fd16a8082f723c570e50269e8 (diff) | |
| download | linux-aa377e682d0703452642d4059a94ab7fdaa90b89.tar.bz2 | |
net/smc: continue waiting if peer signals write_shutdown
If the peer sends a shutdown WRITE, this should not affect sending
in general, and waiting for send buffer space in particular.
Stop waiting of the local socket for send buffer space only, if peer
signals closing, but not if peer signals just shutdown WRITE.
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/smc/smc_tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c index 2e50fddf8ce9..fea6482233a6 100644 --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -86,7 +86,7 @@ static int smc_tx_wait_memory(struct smc_sock *smc, int flags) rc = -EPIPE; break; } - if (conn->local_rx_ctrl.conn_state_flags.peer_conn_abort) { + if (smc_cdc_rxed_any_close(conn)) { rc = -ECONNRESET; break; } @@ -107,7 +107,7 @@ static int smc_tx_wait_memory(struct smc_sock *smc, int flags) sk_wait_event(sk, &timeo, sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN) || - smc_cdc_rxed_any_close_or_senddone(conn) || + smc_cdc_rxed_any_close(conn) || atomic_read(&conn->sndbuf_space), &wait); } |