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

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

 [1]
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu 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: default avatarJakub Kicinski <kuba@kernel.org>
parent d191101d

net/mptcp/pm_kernel.c

+5 −6
Original line number Diff line number Diff line
@@ -1044,24 +1044,23 @@ int mptcp_pm_nl_add_addr_doit(struct sk_buff *skb, struct genl_info *info) 
	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)