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: 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>

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 4581c570ef682df944c07904182e7bbfdd8441cb..e3db319ce92e5087f3c209e0eeb64b265c55fb21 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -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);
 
        /* 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;
 
        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);
        }
 
                __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)
        sk_stop_timer(sk, &sk->sk_timer);
 
        if (mptcp_sk(sk)->token)