diff options
| author | Mark Brown <[email protected]> | 2023-05-19 12:32:04 +0900 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2023-05-19 12:32:04 +0900 |
| commit | af53b00fa3aca3410c89900a34e5d727a27c36e2 (patch) | |
| tree | 1b51641988e0ae56f8de4a693ab3d1aecc5491d4 /net/smc/smc_tx.c | |
| parent | 98be58f2b517b212b57b8493dab92312a52614ac (diff) | |
| parent | f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6 (diff) | |
Merge tag 'v6.4-rc2' into asoc-6.5 to get fixes for CI
Linux 6.4-rc2
Diffstat (limited to 'net/smc/smc_tx.c')
| -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 f4b6a71ac488..45128443f1f1 100644 --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -113,8 +113,8 @@ static int smc_tx_wait(struct smc_sock *smc, int flags) break; /* at least 1 byte of free & no urgent data */ set_bit(SOCK_NOSPACE, &sk->sk_socket->flags); sk_wait_event(sk, &timeo, - sk->sk_err || - (sk->sk_shutdown & SEND_SHUTDOWN) || + READ_ONCE(sk->sk_err) || + (READ_ONCE(sk->sk_shutdown) & SEND_SHUTDOWN) || smc_cdc_rxed_any_close(conn) || (atomic_read(&conn->sndbuf_space) && !conn->urg_tx_pend), |