diff options
| author | Nathan Gao <zcgao@amazon.com> | 2026-03-03 17:37:50 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-03-25 13:03:25 +0300 |
| commit | 4ec349af3ef702d0d52cb2463bebef30739e65bd (patch) | |
| tree | 1b478d840a0c83f5ce711d6a658d89d380367600 | |
| parent | 9610a2c162ef729a3988213a4604376e492f6f44 (diff) | |
| download | linux-4ec349af3ef702d0d52cb2463bebef30739e65bd.tar.xz | |
Revert "selftests: net: amt: wait longer for connection before sending packets"
This reverts commit 7724036d4804222007689cd69f248347eb154793 which is
commit 04708606fd7bdc34b69089a4ff848ff36d7088f9 upstream.
The reverted patch introduced dependency on lib.sh under net selftests.
The file was introduced in v6.8-rc1 via commit 25ae948b4478
("selftests/net: add lib.sh").
Without lib.sh, the amt test fails with:
./amt.sh: line 76: source: lib.sh: file not found
The whole history of lib.sh includes about 50 commits and considering
the file never landed on 6.1 it may be better to not introduce it.
Signed-off-by: Nathan Gao <zcgao@amazon.com>
Acked-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rwxr-xr-x | tools/testing/selftests/net/amt.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/testing/selftests/net/amt.sh b/tools/testing/selftests/net/amt.sh index ea40b469a8c1..7e7ed6c558da 100755 --- a/tools/testing/selftests/net/amt.sh +++ b/tools/testing/selftests/net/amt.sh @@ -73,8 +73,6 @@ # +------------------------+ #============================================================================== -source lib.sh - readonly LISTENER=$(mktemp -u listener-XXXXXXXX) readonly GATEWAY=$(mktemp -u gateway-XXXXXXXX) readonly RELAY=$(mktemp -u relay-XXXXXXXX) @@ -242,15 +240,14 @@ test_ipv6_forward() send_mcast4() { - sleep 5 - wait_local_port_listen ${LISTENER} 4000 udp + sleep 2 ip netns exec "${SOURCE}" bash -c \ 'printf "%s %128s" 172.17.0.2 | nc -w 1 -u 239.0.0.1 4000' & } send_mcast6() { - wait_local_port_listen ${LISTENER} 6000 udp + sleep 2 ip netns exec "${SOURCE}" bash -c \ 'printf "%s %128s" 2001:db8:3::2 | nc -w 1 -u ff0e::5:6 6000' & } |