diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-05-08 18:16:58 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-05-08 18:16:58 +0200 |
| commit | 9b61b2069681b60d0d0bedbd0fe3c70123dddb19 (patch) | |
| tree | 483407944dd3037584b8825e0d33feb7f4eddf5f /net/ipv4/tcp.c | |
| parent | b9112b17950c955071abfd4331d4daa162d6ec4d (diff) | |
| parent | 2ff85dc64df5bc0ff12e2f4e23fae7bbadbf1d5d (diff) | |
| download | linux-stable-9b61b2069681b60d0d0bedbd0fe3c70123dddb19.tar.gz linux-stable-9b61b2069681b60d0d0bedbd0fe3c70123dddb19.tar.bz2 linux-stable-9b61b2069681b60d0d0bedbd0fe3c70123dddb19.zip | |
Merge branch 'topic/hda-config-pm-cleanup' into for-next
Pull HD-audio CONFIG_PM cleanup.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index d20b62d52171..e767721b3a58 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2931,6 +2931,8 @@ void tcp_close(struct sock *sk, long timeout) lock_sock(sk); __tcp_close(sk, timeout); release_sock(sk); + if (!sk->sk_net_refcnt) + inet_csk_clear_xmit_timers_sync(sk); sock_put(sk); } EXPORT_SYMBOL(tcp_close); |