Commit 08b81d87 authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

mptcp: add sk_stop_timer_sync helper 



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: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0abd40f8

include/net/sock.h

+2 −0
Original line number Diff line number Diff line
@@ -2195,6 +2195,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,

net/core/sock.c

+7 −0
Original line number Diff line number Diff line
@@ -2947,6 +2947,13 @@ void sk_stop_timer(struct sock *sk, struct timer_list* timer) 
}

EXPORT_SYMBOL(sk_stop_timer);



void sk_stop_timer_sync(struct sock *sk, struct timer_list *timer)

{

	if (del_timer_sync(timer))

		__sock_put(sk);

}

EXPORT_SYMBOL(sk_stop_timer_sync);



void sock_init_data(struct socket *sock, struct sock *sk)

{

	sk_init_common(sk);