diff options
| author | Jakub Kicinski <[email protected]> | 2024-06-20 20:02:22 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-06-20 20:49:59 +0000 |
| commit | a6ec08beec9ea93f342d6daeac922208709694dc (patch) | |
| tree | e14f4b7f0133e63a20a27baea37506abeba3bb95 /net/core/sock.c | |
| parent | igb: Add MII write support (diff) | |
| parent | Merge tag 'net-6.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | kernel-a6ec08beec9ea93f342d6daeac922208709694dc.tar.gz kernel-a6ec08beec9ea93f342d6daeac922208709694dc.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
drivers/net/ethernet/broadcom/bnxt/bnxt.c
1e7962114c10 ("bnxt_en: Restore PTP tx_avail count in case of skb_pad() error")
165f87691a89 ("bnxt_en: add timestamping statistics support")
No adjacent changes.
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 69baddcfbd8c..9abc4fe25953 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3751,6 +3751,9 @@ void sk_common_release(struct sock *sk) sk->sk_prot->unhash(sk); + if (sk->sk_socket) + sk->sk_socket->sk = NULL; + /* * In this point socket cannot receive new packets, but it is possible * that some packets are in flight because some CPU runs receiver and |