From 34c6c309d5ff7acfe470dac3f974271917e7b19e Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 27 Jan 2021 14:21:36 +0000 Subject: vlib: "revert startup multi-arch variant configuration fix for interfaces" Type: fix This reverts commit 5a48b3b9d88fa2793793e2bf3db8bf156fe2951f. Change-Id: Ifa91b18bdbbc32bb729abc09d95637d9cdf42c3b Signed-off-by: Damjan Marion Signed-off-by: Andrew Yourtchenko --- src/vnet/interface_output.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) (limited to 'src/vnet/interface_output.c') diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c index e79ad451c55..3363f76b722 100644 --- a/src/vnet/interface_output.c +++ b/src/vnet/interface_output.c @@ -513,35 +513,9 @@ CLIB_MARCH_FN_REGISTRATION (vnet_interface_output_node); #ifndef CLIB_MARCH_VARIANT vlib_node_function_t * -vnet_interface_output_node_get (vlib_main_t * vm) +vnet_interface_output_node_get (void) { - vlib_node_function_t *fn = 0; - vlib_node_fn_registration_t *fnr; - char *name = 0; - vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "interface-output"); - ASSERT (node); - - /* search for the same name */ - fnr = node->node_fn_registrations; - while (fnr) - { - if (fnr->function == node->function) - { - name = fnr->name; - break; - } - fnr = fnr->next_registration; - } - - if (name) - { - fn = CLIB_MARCH_FN_POINTER_BY_NAME (vnet_interface_output_node, name); - } - if (!fn) /* revert to march type selection if search failed */ - { - fn = CLIB_MARCH_FN_POINTER (vnet_interface_output_node); - } - return fn; + return CLIB_MARCH_FN_POINTER (vnet_interface_output_node); } #endif /* CLIB_MARCH_VARIANT */ -- cgit 1.2.3-korg