Commit 7991ac22 authored by Geliang Tang's avatar Geliang Tang Committed by Geliang Tang
Browse files

mptcp: drop useless ssk in pm_subflow_check_next 

mainline inclusion
from mainline-v6.7-rc1
commit 74cbb0c65b2963c1f1b51e2426cf0774ed828bc0
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=74cbb0c65b2963c1f1b51e2426cf0774ed828bc0



--------------------------------

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

Reviewed-by: default avatarMatthieu Baerts <matttbe@kernel.org>
Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarMat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-4-db8f25f798eb@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent bc800d54

net/mptcp/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/mptcp/protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -2484,7 +2484,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);

}

net/mptcp/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -894,7 +894,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);