diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-04-09 09:48:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-09 09:48:09 +0200 |
| commit | d1eec383a8abe348b5ce72df9e96bff3d9039134 (patch) | |
| tree | 6ea912eb2d4f2bee8301a04ebf82283805218ebf /net/ipv4/inet_hashtables.c | |
| parent | x86/tsc: Make __use_tsc __ro_after_init (diff) | |
| parent | Linux 6.9-rc3 (diff) | |
| download | linux-d1eec383a8abe348b5ce72df9e96bff3d9039134.tar.xz linux-d1eec383a8abe348b5ce72df9e96bff3d9039134.zip | |
Merge tag 'v6.9-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
| -rw-r--r-- | net/ipv4/inet_hashtables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 7498af320164..cf88eca5f1b4 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -1135,7 +1135,7 @@ error: sock_prot_inuse_add(net, sk->sk_prot, -1); spin_lock(lock); - sk_nulls_del_node_init_rcu(sk); + __sk_nulls_del_node_init_rcu(sk); spin_unlock(lock); sk->sk_hash = 0; |