diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-07-29 03:21:16 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-07-29 03:21:16 +0200 |
| commit | 272ac32f566e3f925b20c231a2b30f6893aa258a (patch) | |
| tree | c7c04a13d89349f0d007914904347df79438f3fa /net/tipc | |
| parent | net: cdns,macb: use correct xlnx prefix for Xilinx (diff) | |
| parent | Merge tag 'net-5.19-final' of git://git.kernel.org/pub/scm/linux/kernel/git/n... (diff) | |
| download | linux-272ac32f566e3f925b20c231a2b30f6893aa258a.tar.xz linux-272ac32f566e3f925b20c231a2b30f6893aa258a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 43509c7e90fc..f1c3b8eb4b3d 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -517,7 +517,7 @@ static int tipc_sk_create(struct net *net, struct socket *sock, timer_setup(&sk->sk_timer, tipc_sk_timeout, 0); sk->sk_shutdown = 0; sk->sk_backlog_rcv = tipc_sk_backlog_rcv; - sk->sk_rcvbuf = sysctl_tipc_rmem[1]; + sk->sk_rcvbuf = READ_ONCE(sysctl_tipc_rmem[1]); sk->sk_data_ready = tipc_data_ready; sk->sk_write_space = tipc_write_space; sk->sk_destruct = tipc_sock_destruct; |