diff options
| author | Geliang Tang <geliangtang@gmail.com> | 2020-09-24 08:30:01 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-13 12:50:12 +0200 |
| commit | 9c382bc16fa8f7499b0663398437e125cf4f763b (patch) | |
| tree | dfd9b497cd4d3e0e6e741f1301af712bdee09e2c /include | |
| parent | 11387b2effbb55f58dc2111ef4b4b896f2756240 (diff) | |
| download | linux-stable-9c382bc16fa8f7499b0663398437e125cf4f763b.tar.gz linux-stable-9c382bc16fa8f7499b0663398437e125cf4f763b.tar.bz2 linux-stable-9c382bc16fa8f7499b0663398437e125cf4f763b.zip | |
mptcp: add sk_stop_timer_sync helper
[ Upstream commit 08b81d873126b413cda511b1ea1cbb0e99938bbd ]
This patch added a new helper sk_stop_timer_sync, it deactivates a timer
like sk_stop_timer, but waits for the handler to finish.
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: 151c9c724d05 ("tcp: properly terminate timers for kernel sockets")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 81888513b3b9..8eea17a41c1c 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2194,6 +2194,8 @@ void sk_reset_timer(struct sock *sk, struct timer_list *timer, void sk_stop_timer(struct sock *sk, struct timer_list *timer); +void sk_stop_timer_sync(struct sock *sk, struct timer_list *timer); + int __sk_queue_drop_skb(struct sock *sk, struct sk_buff_head *sk_queue, struct sk_buff *skb, unsigned int flags, void (*destructor)(struct sock *sk, |