Skip to content

Commit

Permalink
mptcp: use mptcp_stop_timer
Browse files Browse the repository at this point in the history
Use the helper mptcp_stop_timer() instead of using sk_stop_timer() to
stop icsk_retransmit_timer directly.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
geliangtang authored and davem330 committed Apr 27, 2022
1 parent b6e074e commit bcf3cf9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/mptcp/protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit bcf3cf9

Please sign in to comment.