Commit 83d580dd authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

mptcp: use mptcp_check_fallback helper 



Use __mptcp_check_fallback() helper defined in net/mptcp/protocol.h,
instead of open-coding it in both __mptcp_do_fallback() and
mptcp_diag_fill_info().

Reviewed-by: default avatarMatthieu Baerts <matttbe@kernel.org>
Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarMat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-5-db8f25f798eb@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 74cbb0c6

net/mptcp/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ static inline bool mptcp_check_fallback(const struct sock *sk) 


static inline void __mptcp_do_fallback(struct mptcp_sock *msk)

{

	if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags)) {

	if (__mptcp_check_fallback(msk)) {

		pr_debug("TCP fallback already done (msk=%p)", msk);

		return;

	}

net/mptcp/sockopt.c

+1 −1
Original line number Diff line number Diff line
@@ -916,7 +916,7 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) 
			mptcp_pm_get_local_addr_max(msk);

	}



	if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags))

	if (__mptcp_check_fallback(msk))

		flags |= MPTCP_INFO_FLAG_FALLBACK;

	if (READ_ONCE(msk->can_ack))

		flags |= MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED;