Commit 62535200 authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

mptcp: drop unused subflow in mptcp_pm_subflow_established 



This patch drops the unused parameter subflow in
mptcp_pm_subflow_established().

Fixes: 926bdeab ("mptcp: Implement path manager interface commands")
Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d84ad049

net/mptcp/options.c

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk, 
	subflow->pm_notified = 1;

	if (subflow->mp_join) {

		clear_3rdack_retransmission(ssk);

		mptcp_pm_subflow_established(msk, subflow);

		mptcp_pm_subflow_established(msk);

	} else {

		mptcp_pm_fully_established(msk, ssk, GFP_ATOMIC);

	}

net/mptcp/pm.c

+1 −2
Original line number Diff line number Diff line
@@ -152,8 +152,7 @@ void mptcp_pm_connection_closed(struct mptcp_sock *msk) 
	pr_debug("msk=%p", msk);

}



void mptcp_pm_subflow_established(struct mptcp_sock *msk,

				  struct mptcp_subflow_context *subflow)

void mptcp_pm_subflow_established(struct mptcp_sock *msk)

{

	struct mptcp_pm_data *pm = &msk->pm;

net/mptcp/protocol.h

+1 −2
Original line number Diff line number Diff line
@@ -643,8 +643,7 @@ void mptcp_pm_new_connection(struct mptcp_sock *msk, const struct sock *ssk, int 
void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp);

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,

				  struct mptcp_subflow_context *subflow);

void mptcp_pm_subflow_established(struct mptcp_sock *msk);

void mptcp_pm_subflow_closed(struct mptcp_sock *msk, u8 id);

void mptcp_pm_add_addr_received(struct mptcp_sock *msk,

				const struct mptcp_addr_info *addr);