| Message ID | 20231025-send-net-next-20231025-v1-0-db8f25f798eb@kernel.org (mailing list archive) |
|---|---|
| Headers | show |
| Series | mptcp: Fixes and cleanup for v6.7 | expand |
Hello: This series was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 25 Oct 2023 16:37:01 -0700 you wrote: > 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. > > [...] Here is the summary with links: - [net-next,01/10] selftests: mptcp: run userspace pm tests slower https://git.kernel.org/netdev/net-next/c/f4a75e9d1100 - [net-next,02/10] selftests: mptcp: fix wait_rm_addr/sf parameters https://git.kernel.org/netdev/net-next/c/9168ea02b898 - [net-next,03/10] mptcp: userspace pm send RM_ADDR for ID 0 https://git.kernel.org/netdev/net-next/c/84c531f54ad9 - [net-next,04/10] mptcp: drop useless ssk in pm_subflow_check_next https://git.kernel.org/netdev/net-next/c/74cbb0c65b29 - [net-next,05/10] mptcp: use mptcp_check_fallback helper https://git.kernel.org/netdev/net-next/c/83d580ddbe1b - [net-next,06/10] mptcp: use mptcp_get_ext helper https://git.kernel.org/netdev/net-next/c/a16c054b527b - [net-next,07/10] mptcp: move sk assignment statement ahead https://git.kernel.org/netdev/net-next/c/a6c85fc61c08 - [net-next,08/10] mptcp: define more local variables sk https://git.kernel.org/netdev/net-next/c/14cb0e0bf39b - [net-next,09/10] selftests: mptcp: sockopt: drop mptcp_connect var https://git.kernel.org/netdev/net-next/c/e71aab6777a4 - [net-next,10/10] selftests: mptcp: display simult in extra_msg https://git.kernel.org/netdev/net-next/c/629b35a225b0 You are awesome, thank you!
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,