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

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
...@@ -2753,7 +2753,7 @@ static void __mptcp_destroy_sock(struct sock *sk) ...@@ -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*/ /* join list will be eventually flushed (with rst) at sock lock release time*/
list_splice_init(&msk->conn_list, &conn_list); 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); sk_stop_timer(sk, &sk->sk_timer);
msk->pm.status = 0; msk->pm.status = 0;
...@@ -2861,7 +2861,7 @@ static int mptcp_disconnect(struct sock *sk, int flags) ...@@ -2861,7 +2861,7 @@ static int mptcp_disconnect(struct sock *sk, int flags)
__mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_FASTCLOSE); __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); sk_stop_timer(sk, &sk->sk_timer);
if (mptcp_sk(sk)->token) if (mptcp_sk(sk)->token)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment