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

mptcp: use mptcp_stop_timer 



Use the helper mptcp_stop_timer() instead of using sk_stop_timer() to
stop icsk_retransmit_timer directly.

Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6e074e1

net/mptcp/protocol.c

+2 −2
Original line number Diff line number Diff line
@@ -2753,7 +2753,7 @@ static void __mptcp_destroy_sock(struct sock *sk) 
	/* join list will be eventually flushed (with rst) at sock lock release time*/

	list_splice_init(&msk->conn_list, &conn_list);



	sk_stop_timer(sk, &msk->sk.icsk_retransmit_timer);

	mptcp_stop_timer(sk);

	sk_stop_timer(sk, &sk->sk_timer);

	msk->pm.status = 0;
@@ -2861,7 +2861,7 @@ static int mptcp_disconnect(struct sock *sk, int flags) 
		__mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_FASTCLOSE);

	}



	sk_stop_timer(sk, &msk->sk.icsk_retransmit_timer);

	mptcp_stop_timer(sk);

	sk_stop_timer(sk, &sk->sk_timer);



	if (mptcp_sk(sk)->token)