diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-06-20 13:02:22 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-06-20 13:49:59 -0700 |
| commit | a6ec08beec9ea93f342d6daeac922208709694dc (patch) | |
| tree | e14f4b7f0133e63a20a27baea37506abeba3bb95 /net/netrom/nr_timer.c | |
| parent | a012f9a752a5856b29610057c76079fbdbe02abf (diff) | |
| parent | d5a7fc58da039903b332041e8c67daae36f08b50 (diff) | |
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 <kuba@kernel.org>
Diffstat (limited to 'net/netrom/nr_timer.c')
| -rw-r--r-- | net/netrom/nr_timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c index 4e7c968cde2d..5e3ca068f04e 100644 --- a/net/netrom/nr_timer.c +++ b/net/netrom/nr_timer.c @@ -121,7 +121,8 @@ static void nr_heartbeat_expiry(struct timer_list *t) is accepted() it isn't 'dead' so doesn't get removed. */ if (sock_flag(sk, SOCK_DESTROY) || (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) { - sock_hold(sk); + if (sk->sk_state == TCP_LISTEN) + sock_hold(sk); bh_unlock_sock(sk); nr_destroy_socket(sk); goto out; |