tgupdate: merge t/DO-NOT-MERGE-mptcp-enabled-by-default into t/upstre…

…am base
multipath-tcp · May 4, 2021 · 6192a50 · 6192a50
2 parents 2bed876 + 026a64b
commit 6192a50
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
@@ -546,8 +546,7 @@ static void mptcp_sock_destruct(struct sock *sk)
 	 * ESTABLISHED state and will not have the SOCK_DEAD flag.
 	 * Both result in warnings from inet_sock_destruct.
 	 */
-
-	if (sk->sk_state == TCP_ESTABLISHED) {
+	if ((1 << sk->sk_state) & (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)) {
 		sk->sk_state = TCP_CLOSE;
 		WARN_ON_ONCE(sk->sk_socket);
 		sock_orphan(sk);