tgupdate: merge t/DO-NOT-MERGE-mptcp-enabled-by-default into t/upstream base

matttbe · matttbe · commit 88e46ac94c8f · 2025-01-24T10:42:40.000+01:00
diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c
@@ -418,9 +418,9 @@ void mptcp_active_detect_blackhole(struct sock *ssk, bool expired)
 			MPTCP_INC_STATS(net, MPTCP_MIB_MPCAPABLEACTIVEDROP);
 			subflow->mpc_drop = 1;
 			mptcp_subflow_early_fallback(mptcp_sk(subflow->conn), subflow);
-		} else {
-			subflow->mpc_drop = 0;
 		}
+	} else if (ssk->sk_state == TCP_SYN_SENT) {
+		subflow->mpc_drop = 0;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -418,9 +418,9 @@ void mptcp_active_detect_blackhole(struct sock *ssk, bool expired)`
`418`	`418`	`MPTCP_INC_STATS(net, MPTCP_MIB_MPCAPABLEACTIVEDROP);`
`419`	`419`	`subflow->mpc_drop = 1;`
`420`	`420`	`mptcp_subflow_early_fallback(mptcp_sk(subflow->conn), subflow);`
`421`		`- } else {`
`422`		`- subflow->mpc_drop = 0;`
`423`	`421`	`}`
	`422`	`+ } else if (ssk->sk_state == TCP_SYN_SENT) {`
	`423`	`+ subflow->mpc_drop = 0;`
`424`	`424`	`}`
`425`	`425`	`}`
`426`	`426`