[PATCH mptcp-net v2 05/12] Squash to "mptcp: pm: fix RM_ADDR ID for the initial subflow"

Matthieu Baerts (NGI0) posted 12 patches 3 months, 1 week ago
[PATCH mptcp-net v2 05/12] Squash to "mptcp: pm: fix RM_ADDR ID for the initial subflow"
Posted by Matthieu Baerts (NGI0) 3 months, 1 week ago
To be used with __mark_subflow_endp_available() below: the ID should be
the one of the subflow -- can be 0 -- not the one of the entry -- cannot
be 0.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 net/mptcp/pm_netlink.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index eba3c0e2ec0d..b7173163c238 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -1501,9 +1501,8 @@ static int mptcp_nl_remove_subflow_and_signal_addr(struct net *net,
 		mptcp_pm_remove_anno_addr(msk, addr, remove_subflow &&
 					  !(entry->flags & MPTCP_PM_ADDR_FLAG_IMPLICIT));
 
+		list.ids[0] = mptcp_endp_get_local_id(msk, addr);
 		if (remove_subflow) {
-			list.ids[0] = mptcp_endp_get_local_id(msk, addr);
-
 			spin_lock_bh(&msk->pm.lock);
 			mptcp_pm_nl_rm_subflow_received(msk, &list);
 			spin_unlock_bh(&msk->pm.lock);

-- 
2.45.2