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 73a440e44d5287ae6246e074737483f31aa484fb..4fa2b452de7c8361ec575d63a3ce6fbedc220773 100644
--- a/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c
+++ b/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c
@@ -51,27 +51,33 @@ struct veth_configuration {
 	char remote_addr[IP_MAX_LEN]; /* IP address of the remote veth */
 };
 
-static const struct veth_configuration default_config[VETH_PAIRS_COUNT] = {
-	{
-		.local_veth = "veth1-",
-		.remote_veth = "veth11",
-		.next_veth = 1,
-		.remote_addr = IP_SRC,
-		.namespace = "ns-veth11-"
-	},
-	{
-		.local_veth = "veth2-",
-		.remote_veth = "veth22",
-		.next_veth = 2,
-		.remote_addr = "",
-		.namespace = "ns-veth22-"
-	},
+struct net_configuration {
+	struct veth_configuration veth_cfg[VETH_PAIRS_COUNT];
+};
+
+static const struct net_configuration default_config = {
 	{
-		.local_veth = "veth3-",
-		.remote_veth = "veth33",
-		.next_veth = 0,
-		.remote_addr = IP_DST,
-		.namespace = "ns-veth33-"
+		{
+			.local_veth = "veth1-",
+			.remote_veth = "veth11",
+			.next_veth = 1,
+			.remote_addr = IP_SRC,
+			.namespace = "ns-veth11-"
+		},
+		{
+			.local_veth = "veth2-",
+			.remote_veth = "veth22",
+			.next_veth = 2,
+			.remote_addr = "",
+			.namespace = "ns-veth22-"
+		},
+		{
+			.local_veth = "veth3-",
+			.remote_veth = "veth33",
+			.next_veth = 0,
+			.remote_addr = IP_DST,
+			.namespace = "ns-veth33-"
+		}
 	}
 };
 
@@ -83,7 +89,7 @@ struct prog_configuration {
 };
 
 static int attach_programs_to_veth_pair(struct bpf_object **objs, size_t nb_obj,
-					struct veth_configuration *net_config,
+					struct net_configuration *net_config,
 					struct prog_configuration *prog, int index)
 {
 	struct bpf_program *local_prog, *remote_prog;
@@ -106,7 +112,7 @@ static int attach_programs_to_veth_pair(struct bpf_object **objs, size_t nb_obj,
 	if (!ASSERT_OK_PTR(remote_prog, "find remote program"))
 		return -1;
 
-	interface = if_nametoindex(net_config[index].local_veth);
+	interface = if_nametoindex(net_config->veth_cfg[index].local_veth);
 	if (!ASSERT_NEQ(interface, 0, "non zero interface index"))
 		return -1;
 
@@ -115,11 +121,11 @@ static int attach_programs_to_veth_pair(struct bpf_object **objs, size_t nb_obj,
 	if (!ASSERT_OK(ret, "attach xdp program to local veth"))
 		return -1;
 
-	nstoken = open_netns(net_config[index].namespace);
+	nstoken = open_netns(net_config->veth_cfg[index].namespace);
 	if (!ASSERT_OK_PTR(nstoken, "switch to remote veth namespace"))
 		return -1;
 
-	interface = if_nametoindex(net_config[index].remote_veth);
+	interface = if_nametoindex(net_config->veth_cfg[index].remote_veth);
 	if (!ASSERT_NEQ(interface, 0, "non zero interface index")) {
 		close_netns(nstoken);
 		return -1;
@@ -136,31 +142,34 @@ static int attach_programs_to_veth_pair(struct bpf_object **objs, size_t nb_obj,
 	return 0;
 }
 
-static int create_network(struct veth_configuration *net_config)
+static int create_network(struct net_configuration *net_config)
 {
 	int i, err;
 
-	memcpy(net_config, default_config, VETH_PAIRS_COUNT * sizeof(struct veth_configuration));
+	memcpy(net_config, &default_config, sizeof(struct net_configuration));
 
 	/* First create and configure all interfaces */
 	for (i = 0; i < VETH_PAIRS_COUNT; i++) {
-		err = append_tid(net_config[i].namespace, NS_NAME_MAX_LEN);
+		err = append_tid(net_config->veth_cfg[i].namespace, NS_NAME_MAX_LEN);
 		if (!ASSERT_OK(err, "append TID to ns name"))
 			return -1;
 
-		err = append_tid(net_config[i].local_veth, VETH_NAME_MAX_LEN);
+		err = append_tid(net_config->veth_cfg[i].local_veth, VETH_NAME_MAX_LEN);
 		if (!ASSERT_OK(err, "append TID to local veth name"))
 			return -1;
 
-		SYS(fail, "ip netns add %s", net_config[i].namespace);
+		SYS(fail, "ip netns add %s", net_config->veth_cfg[i].namespace);
 		SYS(fail, "ip link add %s type veth peer name %s netns %s",
-		    net_config[i].local_veth, net_config[i].remote_veth, net_config[i].namespace);
-		SYS(fail, "ip link set dev %s up", net_config[i].local_veth);
-		if (net_config[i].remote_addr[0])
-			SYS(fail, "ip -n %s addr add %s/24 dev %s",	net_config[i].namespace,
-			    net_config[i].remote_addr, net_config[i].remote_veth);
-		SYS(fail, "ip -n %s link set dev %s up", net_config[i].namespace,
-		    net_config[i].remote_veth);
+		    net_config->veth_cfg[i].local_veth, net_config->veth_cfg[i].remote_veth,
+		    net_config->veth_cfg[i].namespace);
+		SYS(fail, "ip link set dev %s up", net_config->veth_cfg[i].local_veth);
+		if (net_config->veth_cfg[i].remote_addr[0])
+			SYS(fail, "ip -n %s addr add %s/24 dev %s",
+			    net_config->veth_cfg[i].namespace,
+			    net_config->veth_cfg[i].remote_addr,
+			    net_config->veth_cfg[i].remote_veth);
+		SYS(fail, "ip -n %s link set dev %s up", net_config->veth_cfg[i].namespace,
+		    net_config->veth_cfg[i].remote_veth);
 	}
 
 	return 0;
@@ -169,21 +178,22 @@ static int create_network(struct veth_configuration *net_config)
 	return -1;
 }
 
-static void cleanup_network(struct veth_configuration *net_config)
+static void cleanup_network(struct net_configuration *net_config)
 {
 	struct nstoken *nstoken;
 	int i;
 
 	for (i = 0; i < VETH_PAIRS_COUNT; i++) {
-		bpf_xdp_detach(if_nametoindex(net_config[i].local_veth), 0, NULL);
-		nstoken = open_netns(net_config[i].namespace);
+		bpf_xdp_detach(if_nametoindex(net_config->veth_cfg[i].local_veth), 0, NULL);
+		nstoken = open_netns(net_config->veth_cfg[i].namespace);
 		if (nstoken) {
-			bpf_xdp_detach(if_nametoindex(net_config[i].remote_veth), 0, NULL);
+			bpf_xdp_detach(if_nametoindex(net_config->veth_cfg[i].remote_veth),
+				       0, NULL);
 			close_netns(nstoken);
 		}
 		/* in case the detach failed */
-		SYS_NOFAIL("ip link del %s", net_config[i].local_veth);
-		SYS_NOFAIL("ip netns del %s", net_config[i].namespace);
+		SYS_NOFAIL("ip link del %s", net_config->veth_cfg[i].local_veth);
+		SYS_NOFAIL("ip netns del %s", net_config->veth_cfg[i].namespace);
 	}
 }
 
@@ -210,9 +220,9 @@ static void xdp_veth_redirect(u32 flags)
 			.remote_flags = flags,
 		}
 	};
-	struct veth_configuration net_config[VETH_PAIRS_COUNT];
 	struct bpf_object *bpf_objs[VETH_REDIRECT_SKEL_NB];
 	struct xdp_redirect_map *xdp_redirect_map;
+	struct net_configuration net_config;
 	struct xdp_dummy *xdp_dummy;
 	struct xdp_tx *xdp_tx;
 	int map_fd;
@@ -230,7 +240,7 @@ static void xdp_veth_redirect(u32 flags)
 	if (!ASSERT_OK_PTR(xdp_redirect_map, "xdp_redirect_map__open_and_load"))
 		goto destroy_xdp_tx;
 
-	if (!ASSERT_OK(create_network(net_config), "create network"))
+	if (!ASSERT_OK(create_network(&net_config), "create network"))
 		goto destroy_xdp_redirect_map;
 
 	/* Then configure the redirect map and attach programs to interfaces */
@@ -242,18 +252,18 @@ static void xdp_veth_redirect(u32 flags)
 	bpf_objs[1] = xdp_tx->obj;
 	bpf_objs[2] = xdp_redirect_map->obj;
 	for (i = 0; i < VETH_PAIRS_COUNT; i++) {
-		int next_veth = net_config[i].next_veth;
+		int next_veth = net_config.veth_cfg[i].next_veth;
 		int interface_id;
 		int err;
 
-		interface_id = if_nametoindex(net_config[next_veth].local_veth);
+		interface_id = if_nametoindex(net_config.veth_cfg[next_veth].local_veth);
 		if (!ASSERT_NEQ(interface_id, 0, "non zero interface index"))
 			goto destroy_xdp_redirect_map;
 		err = bpf_map_update_elem(map_fd, &i, &interface_id, BPF_ANY);
 		if (!ASSERT_OK(err, "configure interface redirection through map"))
 			goto destroy_xdp_redirect_map;
 		if (attach_programs_to_veth_pair(bpf_objs, VETH_REDIRECT_SKEL_NB,
-						 net_config, ping_config, i))
+						 &net_config, ping_config, i))
 			goto destroy_xdp_redirect_map;
 	}
 
@@ -261,7 +271,7 @@ static void xdp_veth_redirect(u32 flags)
 	 * veth33 from veth11
 	 */
 	ASSERT_OK(SYS_NOFAIL("ip netns exec %s ping -c 1 -W 1 %s > /dev/null",
-			     net_config[0].namespace, IP_DST), "ping");
+			     net_config.veth_cfg[0].namespace, IP_DST), "ping");
 
 destroy_xdp_redirect_map:
 	xdp_redirect_map__destroy(xdp_redirect_map);
@@ -270,7 +280,7 @@ static void xdp_veth_redirect(u32 flags)
 destroy_xdp_dummy:
 	xdp_dummy__destroy(xdp_dummy);
 
-	cleanup_network(net_config);
+	cleanup_network(&net_config);
 }
 
 void test_xdp_veth_redirect(void)
