tgupdate: merge t/upstream base into t/upstream

multipath-tcp · Mar 9, 2021 · 433f124 · 433f124
2 parents fd254f3 + 37e107d
commit 433f124
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
@@ -90,16 +90,6 @@ static bool mptcp_is_tcpsk(struct sock *sk)
 	return false;
 }
 
-static struct sock *__mptcp_tcp_fallback(struct mptcp_sock *msk)
-{
-	sock_owned_by_me((const struct sock *)msk);
-
-	if (likely(!__mptcp_check_fallback(msk)))
-		return NULL;
-
-	return msk->first;
-}
-
 static int __mptcp_socket_create(struct mptcp_sock *msk)
 {
 	struct mptcp_subflow_context *subflow;