diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2023-07-26 16:48:55 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-07-26 16:48:55 -0700 |
| commit | 2e3c5df2ee89d01c4dc6c30b4366375d3cf942bd (patch) | |
| tree | f49ca03ee5951bba05de25cc5475291ec61d5ee9 /tools | |
| parent | Merge branch 'tools-ynl-gen-fix-parse-multi-attr-enum-attribute' (diff) | |
| parent | mptcp: more accurate NL event generation (diff) | |
| download | wireguard-linux-2e3c5df2ee89d01c4dc6c30b4366375d3cf942bd.tar.xz wireguard-linux-2e3c5df2ee89d01c4dc6c30b4366375d3cf942bd.zip | |
Merge branch 'mptcp-more-fixes-for-6-5'
Mat Martineau says:
====================
mptcp: More fixes for 6.5
Patch 1: Better detection of ip6tables vs ip6tables-legacy tools for
self tests. Fix for 6.4 and newer.
Patch 2: Only generate "new listener" event if listen operation
succeeds. Fix for 6.2 and newer.
====================
Link: https://lore.kernel.org/r/20230725-send-net-20230725-v1-0-6f60fe7137a9@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index e6c9d5451c5b..3c2096ac97ef 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -162,9 +162,7 @@ check_tools() elif ! iptables -V &> /dev/null; then echo "SKIP: Could not run all tests without iptables tool" exit $ksft_skip - fi - - if ! ip6tables -V &> /dev/null; then + elif ! ip6tables -V &> /dev/null; then echo "SKIP: Could not run all tests without ip6tables tool" exit $ksft_skip fi |