Commit fac7a6dd authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Jakub Kicinski
Browse files

mptcp: pm: remove '_nl' from mptcp_pm_nl_addr_send_ack 



Currently, in-kernel PM specific helpers are prefixed with
'mptcp_pm_nl_'. But here 'mptcp_pm_nl_addr_send_ack()' is not specific
to this PM: it is used by both the in-kernel and userspace PMs.

To avoid confusions, the '_nl' bit has been removed from the name.

No behavioural changes intended.

Reviewed-by: default avatarGeliang Tang <geliang@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250307-net-next-mptcp-pm-reorg-v1-2-abef20ada03b@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7462fe22

net/mptcp/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_ 
	msk->pm.rm_list_tx = *rm_list;

	rm_addr |= BIT(MPTCP_RM_ADDR_SIGNAL);

	WRITE_ONCE(msk->pm.addr_signal, rm_addr);

	mptcp_pm_nl_addr_send_ack(msk);

	mptcp_pm_addr_send_ack(msk);

	return 0;

}

net/mptcp/pm_netlink.c

+4 −4
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) 
			local.addr.id = 0;



		mptcp_pm_announce_addr(msk, &local.addr, false);

		mptcp_pm_nl_addr_send_ack(msk);

		mptcp_pm_addr_send_ack(msk);



		if (local.flags & MPTCP_PM_ADDR_FLAG_SUBFLOW)

			signal_and_subflow = true;
@@ -740,7 +740,7 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) 


	remote = msk->pm.remote;

	mptcp_pm_announce_addr(msk, &remote, true);

	mptcp_pm_nl_addr_send_ack(msk);

	mptcp_pm_addr_send_ack(msk);



	if (lookup_subflow_by_daddr(&msk->conn_list, &remote))

		return;
@@ -781,7 +781,7 @@ bool mptcp_pm_nl_is_init_remote_addr(struct mptcp_sock *msk, 
	return mptcp_addresses_equal(&mpc_remote, remote, remote->port);

}



void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk)

void mptcp_pm_addr_send_ack(struct mptcp_sock *msk)

{

	struct mptcp_subflow_context *subflow, *alt = NULL;
@@ -942,7 +942,7 @@ void mptcp_pm_nl_work(struct mptcp_sock *msk) 
	}

	if (pm->status & BIT(MPTCP_PM_ADD_ADDR_SEND_ACK)) {

		pm->status &= ~BIT(MPTCP_PM_ADD_ADDR_SEND_ACK);

		mptcp_pm_nl_addr_send_ack(msk);

		mptcp_pm_addr_send_ack(msk);

	}

	if (pm->status & BIT(MPTCP_PM_RM_ADDR_RECEIVED)) {

		pm->status &= ~BIT(MPTCP_PM_RM_ADDR_RECEIVED);

net/mptcp/pm_userspace.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info) 
	if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) {

		msk->pm.add_addr_signaled++;

		mptcp_pm_announce_addr(msk, &addr_val.addr, false);

		mptcp_pm_nl_addr_send_ack(msk);

		mptcp_pm_addr_send_ack(msk);

	}



	spin_unlock_bh(&msk->pm.lock);

net/mptcp/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -1008,7 +1008,7 @@ void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, 
void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk);

bool mptcp_pm_nl_is_init_remote_addr(struct mptcp_sock *msk,

				     const struct mptcp_addr_info *remote);

void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk);

void mptcp_pm_addr_send_ack(struct mptcp_sock *msk);

void mptcp_pm_rm_addr_received(struct mptcp_sock *msk,

			       const struct mptcp_rm_list *rm_list);

void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup);