check_ping() directly returns a SYS_NOFAIL without any previous
treatment. It's called only once in the file and hardcodes the used
namespace and ip address.
Replace check_ping() with a direct call of SYS_NOFAIL in the test.

Signed-off-by: Bastien Curutchet (eBPF Foundation) 
<bastien.curutc...@bootlin.com>
---
 tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c 
b/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c
index 
95e1791ea7e0f950609607b30d35f78da82e058b..d41884fdc430f1ceed53f16b0dddbdbb34f83301
 100644
--- a/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c
+++ b/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c
@@ -170,15 +170,6 @@ static void cleanup_network(void)
                SYS_NOFAIL("ip netns del %s", config[i].namespace);
 }
 
-static int check_ping(struct skeletons *skeletons)
-{
-       /* Test: if all interfaces are properly configured, we must be able to 
ping
-        * veth33 from veth11
-        */
-       return SYS_NOFAIL("ip netns exec %s ping -c 1 -W 1 %s > /dev/null",
-                                         config[0].namespace, IP_DST);
-}
-
 void test_xdp_veth_redirect(void)
 {
        struct skeletons skeletons = {};
@@ -198,7 +189,11 @@ void test_xdp_veth_redirect(void)
        if (configure_network(&skeletons))
                goto destroy_xdp_redirect_map;
 
-       ASSERT_OK(check_ping(&skeletons), "ping");
+       /* Test: if all interfaces are properly configured, we must be able to 
ping
+        * veth33 from veth11
+        */
+       ASSERT_OK(SYS_NOFAIL("ip netns exec %s ping -c 1 -W 1 %s > /dev/null",
+                            config[0].namespace, IP_DST), "ping");
 
 destroy_xdp_redirect_map:
        xdp_redirect_map__destroy(skeletons.xdp_redirect_maps);

-- 
2.48.1


Reply via email to