diff options
| author | David S. Miller <davem@davemloft.net> | 2023-10-01 19:09:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-10-01 19:09:55 +0100 |
| commit | 2be825ebb9d1b17f1a9e46af78d24b76c4ff7a1f (patch) | |
| tree | 5a49235d004d92fa6330bbeacf24b5252cea032c /net/ipv4/tcp_ipv4.c | |
| parent | 06bc3668cc2a6db2831b9086f0e3c6ebda599dba (diff) | |
| parent | eb44ad4e635132754bfbcb18103f1dcb7058aedd (diff) | |
| download | linux-2be825ebb9d1b17f1a9e46af78d24b76c4ff7a1f.tar.gz linux-2be825ebb9d1b17f1a9e46af78d24b76c4ff7a1f.tar.bz2 linux-2be825ebb9d1b17f1a9e46af78d24b76c4ff7a1f.zip | |
Merge branch 'socket-option-lockless'
Eric Dumazet says:
====================
net: more data-races fixes and lockless socket options
This is yet another round of data-races fixes,
and lockless socket options.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index f13eb7e23d03..95e972be0c05 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -828,7 +828,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) ctl_sk->sk_mark = (sk->sk_state == TCP_TIME_WAIT) ? inet_twsk(sk)->tw_mark : sk->sk_mark; ctl_sk->sk_priority = (sk->sk_state == TCP_TIME_WAIT) ? - inet_twsk(sk)->tw_priority : sk->sk_priority; + inet_twsk(sk)->tw_priority : READ_ONCE(sk->sk_priority); transmit_time = tcp_transmit_time(sk); xfrm_sk_clone_policy(ctl_sk, sk); txhash = (sk->sk_state == TCP_TIME_WAIT) ? |