diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-10 07:31:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-10 07:31:51 +0100 |
| commit | 046cc01be6b9d139b49dfc396b7201c633ff1a26 (patch) | |
| tree | 529f902da1c2ef691ac83491547d816704ac1a83 /net/mptcp/protocol.h | |
| parent | 74fc34937d72d04e89e4f75ea66147cdc9b785f5 (diff) | |
| parent | 80e54e84911a923c40d7bee33a34c1b4be148d7a (diff) | |
| download | linux-next-046cc01be6b9d139b49dfc396b7201c633ff1a26.tar.gz linux-next-046cc01be6b9d139b49dfc396b7201c633ff1a26.zip | |
Merge 6.14-rc6 into char-misc-next
We need the fixes in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mptcp/protocol.h')
| -rw-r--r-- | net/mptcp/protocol.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index f6a207958459..ad21925af061 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1199,6 +1199,8 @@ static inline void __mptcp_do_fallback(struct mptcp_sock *msk) pr_debug("TCP fallback already done (msk=%p)\n", msk); return; } + if (WARN_ON_ONCE(!READ_ONCE(msk->allow_infinite_fallback))) + return; set_bit(MPTCP_FALLBACK_DONE, &msk->flags); } |