Commit 98a0a99e authored by Geliang Tang's avatar Geliang Tang Committed by Paolo Abeni
Browse files

mptcp: pm: only fill id_avail_bitmap for in-kernel pm 



id_avail_bitmap of struct mptcp_pm_data is currently only used by the
in-kernel PM, so this patch moves its initialization operation under
the "if (pm_type == MPTCP_PM_TYPE_KERNEL)" condition.

Suggested-by: default avatarMatthieu Baerts <matttbe@kernel.org>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250313-net-next-mptcp-pm-ops-intro-v1-4-f4e4a88efc50@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 5fff36b6

net/mptcp/pm.c

+2 −1
Original line number Diff line number Diff line
@@ -1000,6 +1000,8 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk) 
			   !!mptcp_pm_get_add_addr_accept_max(msk) &&

			   subflows_allowed);

		WRITE_ONCE(pm->accept_subflow, subflows_allowed);



		bitmap_fill(pm->id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);

	} else {

		WRITE_ONCE(pm->work_pending, 0);

		WRITE_ONCE(pm->accept_addr, 0);
@@ -1009,7 +1011,6 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk) 
	WRITE_ONCE(pm->addr_signal, 0);

	WRITE_ONCE(pm->remote_deny_join_id0, false);

	pm->status = 0;

	bitmap_fill(pm->id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);

}



void mptcp_pm_data_init(struct mptcp_sock *msk)