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_minisocks.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_minisocks.c')
-rw-r--r-- | net/ipv4/tcp_minisocks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index eee8ab1bfa0e..3f87611077ef 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -292,7 +292,7 @@ void tcp_time_wait(struct sock *sk, int state, int timeo) tw->tw_transparent = inet_test_bit(TRANSPARENT, sk); tw->tw_mark = sk->sk_mark; - tw->tw_priority = sk->sk_priority; + tw->tw_priority = READ_ONCE(sk->sk_priority); tw->tw_rcv_wscale = tp->rx_opt.rcv_wscale; tcptw->tw_rcv_nxt = tp->rcv_nxt; tcptw->tw_snd_nxt = tp->snd_nxt; |