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

mptcp: pm: remove '_nl' from mptcp_pm_nl_mp_prio_send_ack 



Currently, in-kernel PM specific helpers are prefixed with
'mptcp_pm_nl_'. But here 'mptcp_pm_nl_mp_prio_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-3-abef20ada03b@kernel.org


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

net/mptcp/pm_netlink.c

+5 −5
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ void mptcp_pm_addr_send_ack(struct mptcp_sock *msk) 
		mptcp_pm_send_ack(msk, alt, false, false);

}



int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,

int mptcp_pm_mp_prio_send_ack(struct mptcp_sock *msk,

			      struct mptcp_addr_info *addr,

			      struct mptcp_addr_info *rem,

			      u8 bkup)
@@ -1936,7 +1936,7 @@ static void mptcp_nl_set_flags(struct net *net, 


		lock_sock(sk);

		if (changed & MPTCP_PM_ADDR_FLAG_BACKUP)

			mptcp_pm_nl_mp_prio_send_ack(msk, &local->addr, NULL, bkup);

			mptcp_pm_mp_prio_send_ack(msk, &local->addr, NULL, bkup);

		/* Subflows will only be recreated if the SUBFLOW flag is set */

		if (is_subflow && (changed & MPTCP_PM_ADDR_FLAG_FULLMESH))

			mptcp_pm_nl_fullmesh(msk, &local->addr);

net/mptcp/pm_userspace.c

+2 −2
Original line number Diff line number Diff line
@@ -605,10 +605,10 @@ int mptcp_userspace_pm_set_flags(struct mptcp_pm_addr_entry *local, 
	spin_unlock_bh(&msk->pm.lock);



	lock_sock(sk);

	ret = mptcp_pm_nl_mp_prio_send_ack(msk, &local->addr, &rem, bkup);

	ret = mptcp_pm_mp_prio_send_ack(msk, &local->addr, &rem, bkup);

	release_sock(sk);



	/* mptcp_pm_nl_mp_prio_send_ack() only fails in one case */

	/* mptcp_pm_mp_prio_send_ack() only fails in one case */

	if (ret < 0)

		GENL_SET_ERR_MSG(info, "subflow not found");

net/mptcp/protocol.h

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

void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq);

int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,

int mptcp_pm_mp_prio_send_ack(struct mptcp_sock *msk,

			      struct mptcp_addr_info *addr,

			      struct mptcp_addr_info *rem,

			      u8 bkup);