diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2025-07-23 16:32:24 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-07-25 11:29:04 -0700 |
| commit | 829fec0244b4ca593ecfaf914e7245ce5b304ec3 (patch) | |
| tree | 72dc3f4b8a602a3142c6a061b94dfdb64ac53fc6 | |
| parent | c65c2e3bae6912b6baf8ea12eeace220e8e99b47 (diff) | |
mptcp: remove pr_fallback()
We can now track fully the fallback status of a given connection via the
relevant mibs, the mentioned helper is redundant. Remove it completely.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250723-net-next-mptcp-track-fallbacks-v1-2-a83cce08f2d5@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/mptcp/options.c | 1 | ||||
| -rw-r--r-- | net/mptcp/protocol.c | 1 | ||||
| -rw-r--r-- | net/mptcp/protocol.h | 3 | ||||
| -rw-r--r-- | net/mptcp/subflow.c | 4 |
4 files changed, 0 insertions, 9 deletions
diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 6cf02344249a..70c0ab0ecf90 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -982,7 +982,6 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk, MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_FALLBACKFAILED); goto reset; } - pr_fallback(msk); return false; } diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 88bf092f230a..9a287b75c1b3 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1167,7 +1167,6 @@ static void mptcp_update_infinite_map(struct mptcp_sock *msk, } mptcp_subflow_ctx(ssk)->send_infinite_map = 0; - pr_fallback(msk); } #define MPTCP_MAX_GSO_SIZE (GSO_LEGACY_MAX_SIZE - (MAX_TCP_HEADER + 1)) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 912f048994a1..b15d7fab5c4b 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1257,13 +1257,10 @@ static inline bool mptcp_try_fallback(struct sock *ssk, int fb_mib) return true; } -#define pr_fallback(a) pr_debug("%s:fallback to TCP (msk=%p)\n", __func__, a) - static inline void mptcp_early_fallback(struct mptcp_sock *msk, struct mptcp_subflow_context *subflow, int fb_mib) { - pr_fallback(msk); subflow->request_mptcp = 0; WARN_ON_ONCE(!__mptcp_try_fallback(msk, fb_mib)); } diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 600e59bba363..3f1b62a9fe88 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -551,7 +551,6 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) goto do_reset; } - pr_fallback(msk); goto fallback; } @@ -1855,14 +1854,11 @@ static void subflow_state_change(struct sock *sk) { struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk); struct sock *parent = subflow->conn; - struct mptcp_sock *msk; __subflow_state_change(sk); - msk = mptcp_sk(parent); if (subflow_simultaneous_connect(sk)) { WARN_ON_ONCE(!mptcp_try_fallback(sk, MPTCP_MIB_SIMULTCONNFALLBACK)); - pr_fallback(msk); subflow->conn_finished = 1; mptcp_propagate_state(parent, sk, subflow, NULL); } |