mptcp: pm: in-kernel: clarify mptcp_pm_remove_anno_addr()

The variable 'ret' was used, but it was not cleared what it was, and
probably led to an issue [1].

Rename it to 'announced' to avoid confusions.

While at it, remove the returned value of the helper: it is only used in
one place, and the returned value is not used.

Link: https://github.com/multipath-tcp/mptcp_net-next/issues/606
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260205-net-mptcp-misc-fixes-6-19-rc8-v2-2-c2720ce75c34@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c
index 4972c19fc73e2e62a8d3d054e6f5db4bf428d7fc..b5316a6c7d1bd7bfbde363de4ad29c820390297c 100644 (file)
--- a/net/mptcp/pm_kernel.c
+++ b/net/mptcp/pm_kernel.c
@@ -1044,24 +1044,23 @@ out_free:
        return ret;
 }
 
-static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk,
+static void mptcp_pm_remove_anno_addr(struct mptcp_sock *msk,
                                      const struct mptcp_addr_info *addr,
                                      bool force)
 {
        struct mptcp_rm_list list = { .nr = 0 };
-       bool ret;
+       bool announced;
 
        list.ids[list.nr++] = mptcp_endp_get_local_id(msk, addr);
 
-       ret = mptcp_remove_anno_list_by_saddr(msk, addr);
-       if (ret || force) {
+       announced = mptcp_remove_anno_list_by_saddr(msk, addr);
+       if (announced || force) {
                spin_lock_bh(&msk->pm.lock);
-               if (ret)
+               if (announced)
                        msk->pm.add_addr_signaled--;
                mptcp_pm_remove_addr(msk, &list);
                spin_unlock_bh(&msk->pm.lock);
        }
-       return ret;
 }
 
 static void __mark_subflow_endp_available(struct mptcp_sock *msk, u8 id)