mptcp: add rm_list_rx in mptcp_pm_data

This patch added a new member rm_list_rx for struct mptcp_pm_data as an list of the removing address ids on the incoming direction. Initialized its nr field to zero in mptcp_pm_data_init. In mptcp_pm_rm_addr_received, set it as the input rm_list. Reviewed-by: Mat Martineau <[email protected]> Signed-off-by: Geliang Tang <[email protected]>
multipath-tcp · Feb 18, 2021 · 8be112e · 8be112e
1 parent ad3cbae
commit 8be112e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
@@ -216,7 +216,7 @@ void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, struct mptcp_rm_list rm_l
 
 	spin_lock_bh(&pm->lock);
 	mptcp_pm_schedule_work(msk, MPTCP_PM_RM_ADDR_RECEIVED);
-	pm->rm_id = rm_list.ids[0];
+	pm->rm_list_rx = rm_list;
 	spin_unlock_bh(&pm->lock);
 }
 
@@ -293,6 +293,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk)
 	msk->pm.local_addr_used = 0;
 	msk->pm.subflows = 0;
 	msk->pm.rm_list_tx.nr = 0;
+	msk->pm.rm_list_rx.nr = 0;
 	WRITE_ONCE(msk->pm.work_pending, false);
 	WRITE_ONCE(msk->pm.addr_signal, 0);
 	WRITE_ONCE(msk->pm.accept_addr, false);

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
@@ -208,6 +208,7 @@ struct mptcp_pm_data {
 	u8		subflows;
 	u8		status;
 	struct mptcp_rm_list rm_list_tx;
+	struct mptcp_rm_list rm_list_rx;
 	u8		rm_id;
 };