diff options
| author | Mark Brown <broonie@kernel.org> | 2023-05-24 11:01:38 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-05-24 11:01:38 +0100 |
| commit | 6c594a820f8fa5ec3619715e32ff5314852ee26b (patch) | |
| tree | 040d56294ccf00202e1820cb3784317034f5c839 /net/ipv4/tcp_input.c | |
| parent | e6beda565b2b1084f9a2cca5c73ae08f1e58c34e (diff) | |
| parent | 44c026a73be8038f03dbdeef028b642880cf1511 (diff) | |
regulator: Merge up v6.4-rc3
Merge up v6.4-rc3 in order to get fixes to improve the stability of my
CI.
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index a057330d6f59..61b6710f337a 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4362,7 +4362,7 @@ void tcp_fin(struct sock *sk) inet_csk_schedule_ack(sk); - sk->sk_shutdown |= RCV_SHUTDOWN; + WRITE_ONCE(sk->sk_shutdown, sk->sk_shutdown | RCV_SHUTDOWN); sock_set_flag(sk, SOCK_DONE); switch (sk->sk_state) { @@ -6599,7 +6599,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) break; tcp_set_state(sk, TCP_FIN_WAIT2); - sk->sk_shutdown |= SEND_SHUTDOWN; + WRITE_ONCE(sk->sk_shutdown, sk->sk_shutdown | SEND_SHUTDOWN); sk_dst_confirm(sk); |