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

matttbe · matttbe · commit 8f7afc29abd7 · 2025-08-15T12:57:16.000+02:00
diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c
@@ -1086,7 +1086,6 @@ static void __flush_addrs(struct list_head *list)
 static void __reset_counters(struct pm_nl_pernet *pernet)
 {
 	WRITE_ONCE(pernet->add_addr_signal_max, 0);
-	WRITE_ONCE(pernet->add_addr_accept_max, 0);
 	WRITE_ONCE(pernet->local_addr_max, 0);
 	pernet->addrs = 0;
 }
diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testing/selftests/net/mptcp/pm_netlink.sh
@@ -198,6 +198,7 @@ set_limits 1 9 2>/dev/null
 check "get_limits" "${default_limits}" "subflows above hard limit"
 
 set_limits 8 8
+flush_endpoint  ## to make sure it doesn't affect the limits
 check "get_limits" "$(format_limits 8 8)" "set limits"
 
 flush_endpoint

Original file line number	Diff line number	Diff line change
`@@ -1086,7 +1086,6 @@ static void __flush_addrs(struct list_head *list)`
`1086`	`1086`	`static void __reset_counters(struct pm_nl_pernet *pernet)`
`1087`	`1087`	`{`
`1088`	`1088`	`WRITE_ONCE(pernet->add_addr_signal_max, 0);`
`1089`		`- WRITE_ONCE(pernet->add_addr_accept_max, 0);`
`1090`	`1089`	`WRITE_ONCE(pernet->local_addr_max, 0);`
`1091`	`1090`	`pernet->addrs = 0;`
`1092`	`1091`	`}`