[MPTCP] [RFC PATCH 4/4] Squash-to: "mptcp: cope with later TCP fallback"

[MPTCP] [RFC PATCH 4/4] Squash-to: "mptcp: cope with later TCP fallback"

[Paolo Abeni]

[-- Attachment #1: Type: text/plain, Size: 901 bytes --]

Now we can fully restore the subflow status on late tcp fallback

Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
 net/mptcp/protocol.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 71e82fd326c5..14c0bd79a534 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -52,10 +52,10 @@ static struct socket *__mptcp_fallback_to_tcp(struct mptcp_sock *msk,
 	lock_sock(ssk);
 	sock_graft(ssk, sock);
 	if (subflow->conn) {
-		/* Clearing the 'conn' field will make the ULP-overriden
-		 * ops behaving like plain TCP ones.
-		 * Note: we can't release the ULP data on a live socket.
+		/* We can't release the ULP data on a live socket,
+		 * restore the tcp callback
 		 */
+		mptcp_subflow_tcp_fallback(ssk, subflow);
 		sock_put(subflow->conn);
 		subflow->conn = NULL;
 	}
-- 
2.21.0