From fd1d84ca7ac48cf802928435d6e11bf8474ef447 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 7 Mar 2025 14:49:22 +0000 Subject: [PATCH] Revert "mptcp: handle fastopen disconnect correctly" This reverts commit 73e268b4be27b36ae68ea10755cb003f43b38884 which is commit 619af16b3b57a3a4ee50b9a30add9ff155541e71 upstream. It breaks the Android kernel build and can be brought back in the future in an safe way if it is really needed. Bug: 161946584 Change-Id: Ice4a456e51817eb48fad85c2ae048a88338807ef Signed-off-by: Greg Kroah-Hartman --- net/mptcp/protocol.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 53dd29018b18..f31e0fcd3727 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1779,10 +1779,8 @@ static int mptcp_sendmsg_fastopen(struct sock *sk, struct sock *ssk, struct msgh * see mptcp_disconnect(). * Attempt it again outside the problematic scope. */ - if (!mptcp_disconnect(sk, 0)) { - sk->sk_disconnects++; + if (!mptcp_disconnect(sk, 0)) sk->sk_socket->state = SS_UNCONNECTED; - } } return ret;