summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoît Ganne <bganne@cisco.com>2020-04-24 09:20:13 +0200
committerDave Barach <openvpp@barachs.net>2020-04-27 15:04:37 +0000
commit83ceffcd980494c6146ca67a0fa709b2c37ef13e (patch)
tree1f894bc6a6657c41a83ebdcdec6fda7e310aee83
parenta66971f980187efd03a84d340b80a7d3cf39deac (diff)
ioam: do not reuse existing vnet symbol
vxlan_gpe_init() is already defined in libvnet. When loading ioam plugin we end up having 2 different objects using the same symbol. ASan in GCC-10 started to enforce the One-Definition-Rule and it seems like good hygiene anyway. Type: fix Change-Id: I2ea9af1821bca6482a290742e9a109fc25692f37 Signed-off-by: Benoît Ganne <bganne@cisco.com>
-rw-r--r--src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
index 6255ce53be5..9f6d181f0b1 100644
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_api.c
@@ -204,7 +204,7 @@ static void vl_api_vxlan_gpe_ioam_transit_disable_t_handler
#include <ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api.c>
static clib_error_t *
-vxlan_gpe_init (vlib_main_t * vm)
+ioam_vxlan_gpe_init (vlib_main_t * vm)
{
vxlan_gpe_ioam_main_t *sm = &vxlan_gpe_ioam_main;
u32 encap_node_index = vxlan_gpe_encap_ioam_v4_node.index;
@@ -242,7 +242,7 @@ vxlan_gpe_init (vlib_main_t * vm)
return 0;
}
-VLIB_INIT_FUNCTION (vxlan_gpe_init);
+VLIB_INIT_FUNCTION (ioam_vxlan_gpe_init);
/*
* fd.io coding-style-patch-verification: ON