This series includes three initial patches that we had queued in our mptcp-net branch, but given the likely timing of net/net-next syncs this week, the need to avoid introducing branch conflicts, and another batch of net-next patches pending in the mptcp tree, the most practical route is to send everything for net-next.
Patches 1 & 2 fix some intermittent selftest failures by adjusting timing.
Patch 3 removes an unneccessary userspace path manager restriction on the removal of subflows with subflow ID 0.
The remainder of the patches are all cleanup or selftest changes:
Patches 4-8 clean up kernel code by removing unused parameters, making more consistent use of existing helper functions, and reducing extra casting of socket pointers.
Patch 9 removes an unused variable in a selftest script.
Patch 10 adds a little more detail to some mptcp_join test output.
Signed-off-by: Mat Martineau martineau@kernel.org --- Geliang Tang (10): selftests: mptcp: run userspace pm tests slower selftests: mptcp: fix wait_rm_addr/sf parameters mptcp: userspace pm send RM_ADDR for ID 0 mptcp: drop useless ssk in pm_subflow_check_next mptcp: use mptcp_check_fallback helper mptcp: use mptcp_get_ext helper mptcp: move sk assignment statement ahead mptcp: define more local variables sk selftests: mptcp: sockopt: drop mptcp_connect var selftests: mptcp: display simult in extra_msg
net/mptcp/pm.c | 2 +- net/mptcp/pm_userspace.c | 81 +++++++++++++++++----- net/mptcp/protocol.c | 6 +- net/mptcp/protocol.h | 4 +- net/mptcp/sockopt.c | 2 +- tools/testing/selftests/net/mptcp/mptcp_join.sh | 23 ++++-- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 1 - 7 files changed, 88 insertions(+), 31 deletions(-) --- base-commit: 8846f9a04b10b7f61214425409838d764df7080d change-id: 20231025-send-net-next-20231025-6bd0ee2d8d7d
Best regards,