mptcp: drop useless ssk in pm_subflow_check_next

The code using 'ssk' parameter of mptcp_pm_subflow_check_next() has been
dropped in commit "95d686517884 (mptcp: fix subflow accounting on close)".
So drop this useless parameter ssk.

Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-4-db8f25f798eb@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index d8da5374d9e13335ff6bf83301a7e6c23123df56..4ae19113b8eb2227378c7ef10ce43dd5728b5c61 100644 (file)
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -184,7 +184,7 @@ void mptcp_pm_subflow_established(struct mptcp_sock *msk)
        spin_unlock_bh(&pm->lock);
 }
 
-void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk,
+void mptcp_pm_subflow_check_next(struct mptcp_sock *msk,
                                 const struct mptcp_subflow_context *subflow)
 {
        struct mptcp_pm_data *pm = &msk->pm;

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 1dacc072dcca36357a1ba9b040d7035b9a1aacb2..a29116eda30a5aabda5a2fa4d6c90a33cad1d6c9 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -2490,7 +2490,7 @@ void mptcp_close_ssk(struct sock *sk, struct sock *ssk,
        /* subflow aborted before reaching the fully_established status
         * attempt the creation of the next subflow
         */
-       mptcp_pm_subflow_check_next(mptcp_sk(sk), ssk, subflow);
+       mptcp_pm_subflow_check_next(mptcp_sk(sk), subflow);
 
        __mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_PUSH);
 }

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 9092fcf187987848c867e4c277e4a79201d20344..a5322074353b637e4aa2169bf402ff2a3c958d67 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -888,7 +888,7 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk);
 void mptcp_pm_connection_closed(struct mptcp_sock *msk);
 void mptcp_pm_subflow_established(struct mptcp_sock *msk);
 bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk);
-void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk,
+void mptcp_pm_subflow_check_next(struct mptcp_sock *msk,
                                 const struct mptcp_subflow_context *subflow);
 void mptcp_pm_add_addr_received(const struct sock *ssk,
                                const struct mptcp_addr_info *addr);