Commit 7a486c44 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

mptcp: drop unneeded argument 



After commit 3a236aef ("mptcp: refactor passive socket initialization"),
every mptcp_pm_fully_established() call is always invoked with a
GFP_ATOMIC argument. We can then drop it.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0475135f

net/mptcp/options.c

+1 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk, 
		clear_3rdack_retransmission(ssk);

		mptcp_pm_subflow_established(msk);

	} else {

		mptcp_pm_fully_established(msk, ssk, GFP_ATOMIC);

		mptcp_pm_fully_established(msk, ssk);

	}

	return true;

net/mptcp/pm.c

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static bool mptcp_pm_schedule_work(struct mptcp_sock *msk, 
	return true;

}



void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp)

void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk)

{

	struct mptcp_pm_data *pm = &msk->pm;

	bool announce = false;
@@ -150,7 +150,7 @@ void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk, 
	spin_unlock_bh(&pm->lock);



	if (announce)

		mptcp_event(MPTCP_EVENT_ESTABLISHED, msk, ssk, gfp);

		mptcp_event(MPTCP_EVENT_ESTABLISHED, msk, ssk, GFP_ATOMIC);

}



void mptcp_pm_connection_closed(struct mptcp_sock *msk)

net/mptcp/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ bool mptcp_pm_addr_families_match(const struct sock *sk, 
void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk);

void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk);

void mptcp_pm_new_connection(struct mptcp_sock *msk, const struct sock *ssk, int server_side);

void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp);

void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk);

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);

net/mptcp/subflow.c

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk, 
			 */

			if (mp_opt.suboptions & OPTION_MPTCP_MPC_ACK) {

				mptcp_subflow_fully_established(ctx, &mp_opt);

				mptcp_pm_fully_established(owner, child, GFP_ATOMIC);

				mptcp_pm_fully_established(owner, child);

				ctx->pm_notified = 1;

			}

		} else if (ctx->mp_join) {