Skip to content

Commit 3ec544f

Browse files
matttbegregkh
authored andcommitted
selftests: mptcp: pm: restrict 'unknown' check to pm_nl_ctl
commit 53705dd upstream. When pm_netlink.sh is executed with '-i', 'ip mptcp' is used instead of 'pm_nl_ctl'. IPRoute2 doesn't support the 'unknown' flag, which has only been added to 'pm_nl_ctl' for this specific check: to ensure that the kernel ignores such unsupported flag. No reason to add this flag to 'ip mptcp'. Then, this check should be skipped when 'ip mptcp' is used. Fixes: 0cef6fc ("selftests: mptcp: ip_mptcp option for more scripts") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20260505-net-mptcp-pm-fixes-7-1-rc3-v1-11-fca8091060a4@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 9d5173e commit 3ec544f

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

tools/testing/selftests/net/mptcp/pm_netlink.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,13 @@ check "show_endpoints" \
193193
flush_endpoint
194194
check "show_endpoints" "" "flush addrs"
195195

196-
add_endpoint 10.0.1.1 flags unknown
197-
check "show_endpoints" "$(format_endpoints "1,10.0.1.1")" "ignore unknown flags"
198-
flush_endpoint
196+
# "unknown" flag is only supported by pm_nl_ctl
197+
if ! mptcp_lib_is_ip_mptcp; then
198+
add_endpoint 10.0.1.1 flags unknown
199+
check "show_endpoints" "$(format_endpoints "1,10.0.1.1")" \
200+
"ignore unknown flags"
201+
flush_endpoint
202+
fi
199203

200204
set_limits 9 1 2>/dev/null
201205
check "get_limits" "${default_limits}" "rcv addrs above hard limit"

0 commit comments

Comments
 (0)