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: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250307-net-next-mptcp-pm-reorg-v1-3-abef20ada03b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index a70a688eae845c562c03caa0f3e20169c5f5be11..5494b5b409dc478dc783844b9cfdef870688d17e 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -808,10 +808,10 @@ 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,
-                                struct mptcp_addr_info *addr,
-                                struct mptcp_addr_info *rem,
-                                u8 bkup)
+int mptcp_pm_mp_prio_send_ack(struct mptcp_sock *msk,
+                             struct mptcp_addr_info *addr,
+                             struct mptcp_addr_info *rem,
+                             u8 bkup)
 {
        struct mptcp_subflow_context *subflow;
 
@@ -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);

diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index b41e1aaa1d1cbd8d185c1951b65984b7e5d64923..2626b2b092d4ee901417fca89c0e2266398d54d2 100644 (file)
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -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");
 

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 2a3eb2392b3bb0f465948a0a881dafbe800efb3d..5508343f2c698e997a7c22f4511a036888993f7a 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -1013,10 +1013,10 @@ 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,
-                                struct mptcp_addr_info *addr,
-                                struct mptcp_addr_info *rem,
-                                u8 bkup);
+int mptcp_pm_mp_prio_send_ack(struct mptcp_sock *msk,
+                             struct mptcp_addr_info *addr,
+                             struct mptcp_addr_info *rem,
+                             u8 bkup);
 bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,
                              const struct mptcp_addr_info *addr);
 void mptcp_pm_free_anno_list(struct mptcp_sock *msk);