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: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231025-send-net-next-20231025-v1-5-db8f25f798eb@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index a5322074353b637e4aa2169bf402ff2a3c958d67..fe6f2d399ee8987f6f03fc65501e46bd43be0e52 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -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;
        }

diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
index 574e221bb765ae1d6a1773c0c8fae05fc53925cb..77f5e8932abf64370e00ffe473a0cd9431494898 100644 (file)
--- a/net/mptcp/sockopt.c
+++ b/net/mptcp/sockopt.c
@@ -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;