Commit 5fff36b6 authored by Geliang Tang's avatar Geliang Tang Committed by Paolo Abeni
Browse files

mptcp: pm: use pm variable instead of msk->pm 



The variable "pm" has been defined in mptcp_pm_fully_established()
and mptcp_pm_data_reset() as "msk->pm", so use "pm" directly instead
of using "msk->pm".

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-3-f4e4a88efc50@kernel.org


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

net/mptcp/pm.c

+4 −4
Original line number Diff line number Diff line
@@ -511,13 +511,13 @@ void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk) 
	 * be sure to serve this event only once.

	 */

	if (READ_ONCE(pm->work_pending) &&

	    !(msk->pm.status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)))

	    !(pm->status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)))

		mptcp_pm_schedule_work(msk, MPTCP_PM_ESTABLISHED);



	if ((msk->pm.status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)) == 0)

	if ((pm->status & BIT(MPTCP_PM_ALREADY_ESTABLISHED)) == 0)

		announce = true;



	msk->pm.status |= BIT(MPTCP_PM_ALREADY_ESTABLISHED);

	pm->status |= BIT(MPTCP_PM_ALREADY_ESTABLISHED);

	spin_unlock_bh(&pm->lock);



	if (announce)
@@ -1009,7 +1009,7 @@ 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(msk->pm.id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);

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

}



void mptcp_pm_data_init(struct mptcp_sock *msk)