tgupdate: merge t/selftests-mptcp-pm_nl_ctl-always-look-for-errors ba…

…se into t/selftests-mptcp-pm_nl_ctl-always-look-for-errors
intel-lab-lkp · Jul 28, 2023 · 7ba82a6 · 7ba82a6
2 parents 8353de0 + 9ba58c8
commit 7ba82a6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
@@ -2334,7 +2334,7 @@ static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk,
 
 	lock_sock_nested(ssk, SINGLE_DEPTH_NESTING);
 
-	if (flags & MPTCP_CF_FASTCLOSE) {
+	if ((flags & MPTCP_CF_FASTCLOSE) && !__mptcp_check_fallback(msk)) {
 		/* be sure to force the tcp_disconnect() path,
 		 * to generate the egress reset
 		 */