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

mptcp: pm: remove '_nl' from mptcp_pm_nl_is_init_remote_addr 



Currently, in-kernel PM specific helpers are prefixed with
'mptcp_pm_nl_'. But here 'mptcp_pm_nl_is_init_remote_addr' is not
specific to this PM: it is called from pm.c for 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-7-abef20ada03b@kernel.org


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

net/mptcp/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ void mptcp_pm_add_addr_received(const struct sock *ssk, 
			__MPTCP_INC_STATS(sock_net((struct sock *)msk), MPTCP_MIB_ADDADDRDROP);

		}

	/* id0 should not have a different address */

	} else if ((addr->id == 0 && !mptcp_pm_nl_is_init_remote_addr(msk, addr)) ||

	} else if ((addr->id == 0 && !mptcp_pm_is_init_remote_addr(msk, addr)) ||

		   (addr->id > 0 && !READ_ONCE(pm->accept_addr))) {

		mptcp_pm_announce_addr(msk, addr, true);

		mptcp_pm_add_addr_send_ack(msk);

net/mptcp/pm_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) 
	}

}



bool mptcp_pm_nl_is_init_remote_addr(struct mptcp_sock *msk,

bool mptcp_pm_is_init_remote_addr(struct mptcp_sock *msk,

				  const struct mptcp_addr_info *remote)

{

	struct mptcp_addr_info mpc_remote;

net/mptcp/protocol.h

+2 −2
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ void mptcp_pm_add_addr_received(const struct sock *ssk, 
void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,

			      const struct mptcp_addr_info *addr);

void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk);

bool mptcp_pm_nl_is_init_remote_addr(struct mptcp_sock *msk,

bool mptcp_pm_is_init_remote_addr(struct mptcp_sock *msk,

				  const struct mptcp_addr_info *remote);

void mptcp_pm_addr_send_ack(struct mptcp_sock *msk);

void mptcp_pm_rm_addr_received(struct mptcp_sock *msk,