Skip to content

Commit 74cbb0c

Browse files
geliangtangkuba-moo
authored andcommitted
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>
1 parent 84c531f commit 74cbb0c

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

net/mptcp/pm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ void mptcp_pm_subflow_established(struct mptcp_sock *msk)
184184
spin_unlock_bh(&pm->lock);
185185
}
186186

187-
void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk,
187+
void mptcp_pm_subflow_check_next(struct mptcp_sock *msk,
188188
const struct mptcp_subflow_context *subflow)
189189
{
190190
struct mptcp_pm_data *pm = &msk->pm;

net/mptcp/protocol.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2490,7 +2490,7 @@ void mptcp_close_ssk(struct sock *sk, struct sock *ssk,
24902490
/* subflow aborted before reaching the fully_established status
24912491
* attempt the creation of the next subflow
24922492
*/
2493-
mptcp_pm_subflow_check_next(mptcp_sk(sk), ssk, subflow);
2493+
mptcp_pm_subflow_check_next(mptcp_sk(sk), subflow);
24942494

24952495
__mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_PUSH);
24962496
}

net/mptcp/protocol.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk);
888888
void mptcp_pm_connection_closed(struct mptcp_sock *msk);
889889
void mptcp_pm_subflow_established(struct mptcp_sock *msk);
890890
bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk);
891-
void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk,
891+
void mptcp_pm_subflow_check_next(struct mptcp_sock *msk,
892892
const struct mptcp_subflow_context *subflow);
893893
void mptcp_pm_add_addr_received(const struct sock *ssk,
894894
const struct mptcp_addr_info *addr);

0 commit comments

Comments
 (0)