The network topology is held by the config[] table. This 'config' name
is a bit too generic if we want to add other configuration variable.
Rename config[] to net_config[].
Signed-off-by: Bastien Curutchet (eBPF Foundation)
<bastien.curutc...@bootlin.com>
---
.../selftests/bpf/prog_tests/test_xdp_veth.c | 30 +++++++++++-----------
1 file changed, 15 insertions(+), 15 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
8507863e61bbea99c906c60ed4535e23d530588c..e84ff834736ddd35a787e5b7a7f20a48efba7649
100644
--- a/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c
+++ b/tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c
@@ -55,7 +55,7 @@ struct veth_configuration {
char *remote_addr; /* IP address of the remote veth */
};
-static struct veth_configuration config[VETH_PAIRS_COUNT] = {
+static struct veth_configuration net_config[VETH_PAIRS_COUNT] = {
{
.local_veth = "veth1",
.remote_veth = "veth11",
@@ -107,17 +107,17 @@ static int attach_programs_to_veth_pair(struct skeletons
*skeletons, int index)
remote_link = &skeletons->xdp_dummy->links.xdp_dummy_prog;
break;
}
- interface = if_nametoindex(config[index].local_veth);
+ interface = if_nametoindex(net_config[index].local_veth);
if (!ASSERT_NEQ(interface, 0, "non zero interface index"))
return -1;
link = bpf_program__attach_xdp(local_prog, interface);
if (!ASSERT_OK_PTR(link, "attach xdp program to local veth"))
return -1;
*local_link = link;
- nstoken = open_netns(config[index].namespace);
+ nstoken = open_netns(net_config[index].namespace);
if (!ASSERT_OK_PTR(nstoken, "switch to remote veth namespace"))
return -1;
- interface = if_nametoindex(config[index].remote_veth);
+ interface = if_nametoindex(net_config[index].remote_veth);
if (!ASSERT_NEQ(interface, 0, "non zero interface index")) {
close_netns(nstoken);
return -1;
@@ -137,15 +137,15 @@ static int create_network(void)
/* First create and configure all interfaces */
for (i = 0; i < VETH_PAIRS_COUNT; i++) {
- SYS(fail, "ip netns add %s", config[i].namespace);
+ SYS(fail, "ip netns add %s", net_config[i].namespace);
SYS(fail, "ip link add %s type veth peer name %s netns %s",
- config[i].local_veth, config[i].remote_veth,
config[i].namespace);
- SYS(fail, "ip link set dev %s up", config[i].local_veth);
- if (config[i].remote_addr)
- SYS(fail, "ip -n %s addr add %s/24 dev %s",
config[i].namespace,
- config[i].remote_addr, config[i].remote_veth);
- SYS(fail, "ip -n %s link set dev %s up", config[i].namespace,
- config[i].remote_veth);
+ 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)
+ 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);
}
return 0;
@@ -162,7 +162,7 @@ static void cleanup_network(void)
/* Deleting namespaces is enough to automatically remove veth pairs as
well
*/
for (i = 0; i < VETH_PAIRS_COUNT; i++)
- SYS_NOFAIL("ip netns del %s", config[i].namespace);
+ SYS_NOFAIL("ip netns del %s", net_config[i].namespace);
}
static int check_ping(void)
@@ -171,7 +171,7 @@ static int check_ping(void)
* veth33 from veth11
*/
return SYS_NOFAIL("ip netns exec %s ping -c 1 -W 1 %s > /dev/null",
- config[0].namespace, IP_DST);
+ net_config[0].namespace, IP_DST);
}
void test_xdp_veth_redirect(void)
@@ -204,7 +204,7 @@ void test_xdp_veth_redirect(void)
int interface_id;
int err;
- interface_id = if_nametoindex(config[i].next_veth);
+ interface_id = if_nametoindex(net_config[i].next_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);
--
2.47.1
