Skip to content

Commit 3438db3

Browse files
committed
mptcp: export mptcp_subflow_early_fallback()
JIRA: https://issues.redhat.com/browse/RHEL-115624 Upstream Status: net.git commit 65b0226 commit 65b0226 Author: Matthieu Baerts (NGI0) <matttbe@kernel.org> Date: Mon Sep 9 22:09:21 2024 +0200 mptcp: export mptcp_subflow_early_fallback() This helper will be used outside protocol.h in the following commit. While at it, also add a 'pr_fallback()' debug print, to help identifying fallbacks. Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20240909-net-next-mptcp-fallback-x-mpc-v1-1-da7ebb4cd2a3@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Davide Caratti <dcaratti@redhat.com>
1 parent a6cb11a commit 3438db3

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

net/mptcp/protocol.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3734,13 +3734,6 @@ static int mptcp_ioctl(struct sock *sk, int cmd, int *karg)
37343734
return 0;
37353735
}
37363736

3737-
static void mptcp_subflow_early_fallback(struct mptcp_sock *msk,
3738-
struct mptcp_subflow_context *subflow)
3739-
{
3740-
subflow->request_mptcp = 0;
3741-
__mptcp_do_fallback(msk);
3742-
}
3743-
37443737
static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
37453738
{
37463739
struct mptcp_subflow_context *subflow;

net/mptcp/protocol.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,6 +1210,14 @@ static inline void mptcp_do_fallback(struct sock *ssk)
12101210

12111211
#define pr_fallback(a) pr_debug("%s:fallback to TCP (msk=%p)\n", __func__, a)
12121212

1213+
static inline void mptcp_subflow_early_fallback(struct mptcp_sock *msk,
1214+
struct mptcp_subflow_context *subflow)
1215+
{
1216+
pr_fallback(msk);
1217+
subflow->request_mptcp = 0;
1218+
__mptcp_do_fallback(msk);
1219+
}
1220+
12131221
static inline bool mptcp_check_infinite_map(struct sk_buff *skb)
12141222
{
12151223
struct mptcp_ext *mpext;

0 commit comments

Comments
 (0)