Skip to content

Commit 69e53e9

Browse files
Geliang Tangintel-lab-lkp
authored andcommitted
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: Matthieu Baerts <[email protected]> Signed-off-by: Geliang Tang <[email protected]>
1 parent 2638c67 commit 69e53e9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

net/mptcp/pm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,6 +1000,8 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk)
10001000
!!mptcp_pm_get_add_addr_accept_max(msk) &&
10011001
subflows_allowed);
10021002
WRITE_ONCE(pm->accept_subflow, subflows_allowed);
1003+
1004+
bitmap_fill(pm->id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
10031005
} else {
10041006
WRITE_ONCE(pm->work_pending, 0);
10051007
WRITE_ONCE(pm->accept_addr, 0);
@@ -1009,7 +1011,6 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk)
10091011
WRITE_ONCE(pm->addr_signal, 0);
10101012
WRITE_ONCE(pm->remote_deny_join_id0, false);
10111013
pm->status = 0;
1012-
bitmap_fill(pm->id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);
10131014
}
10141015

10151016
void mptcp_pm_data_init(struct mptcp_sock *msk)

0 commit comments

Comments
 (0)