Skip to content

Commit e2040a0

Browse files
Paolo Abeniintel-lab-lkp
authored andcommitted
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 <[email protected]>
1 parent cdbabff commit e2040a0

File tree

4 files changed

+0
-9
lines changed

4 files changed

+0
-9
lines changed

net/mptcp/options.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,6 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
982982
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_FALLBACKFAILED);
983983
goto reset;
984984
}
985-
pr_fallback(msk);
986985
return false;
987986
}
988987

net/mptcp/protocol.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,6 @@ static void mptcp_update_infinite_map(struct mptcp_sock *msk,
11671167
}
11681168

11691169
mptcp_subflow_ctx(ssk)->send_infinite_map = 0;
1170-
pr_fallback(msk);
11711170
}
11721171

11731172
#define MPTCP_MAX_GSO_SIZE (GSO_LEGACY_MAX_SIZE - (MAX_TCP_HEADER + 1))

net/mptcp/protocol.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,13 +1254,10 @@ static inline bool mptcp_try_fallback(struct sock *ssk, int fb_mib)
12541254
return true;
12551255
}
12561256

1257-
#define pr_fallback(a) pr_debug("%s:fallback to TCP (msk=%p)\n", __func__, a)
1258-
12591257
static inline void mptcp_early_fallback(struct mptcp_sock *msk,
12601258
struct mptcp_subflow_context *subflow,
12611259
int fb_mib)
12621260
{
1263-
pr_fallback(msk);
12641261
subflow->request_mptcp = 0;
12651262
WARN_ON_ONCE(!__mptcp_try_fallback(msk, fb_mib));
12661263
}

net/mptcp/subflow.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,6 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)
551551
goto do_reset;
552552
}
553553

554-
pr_fallback(msk);
555554
goto fallback;
556555
}
557556

@@ -1855,14 +1854,11 @@ static void subflow_state_change(struct sock *sk)
18551854
{
18561855
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
18571856
struct sock *parent = subflow->conn;
1858-
struct mptcp_sock *msk;
18591857

18601858
__subflow_state_change(sk);
18611859

1862-
msk = mptcp_sk(parent);
18631860
if (subflow_simultaneous_connect(sk)) {
18641861
WARN_ON_ONCE(!mptcp_try_fallback(sk, MPTCP_MIB_SIMULTCONNFALLBACK));
1865-
pr_fallback(msk);
18661862
subflow->conn_finished = 1;
18671863
mptcp_propagate_state(parent, sk, subflow, NULL);
18681864
}

0 commit comments

Comments
 (0)