summaryrefslogtreecommitdiffstats
path: root/src/vlib/node_init.c
diff options
context:
space:
mode:
authorDamjan Marion <dmarion@me.com>2021-01-27 14:21:36 +0000
committerDamjan Marion <dmarion@me.com>2021-02-04 14:46:55 +0000
commit34c6c309d5ff7acfe470dac3f974271917e7b19e (patch)
treea857f1cfc410dc3d4a329a9609cdbdc1625d8cb3 /src/vlib/node_init.c
parent6b3f1c0a9cf66f82cda1dc6b15982ee910671340 (diff)
vlib: "revert startup multi-arch variant configuration fix for interfaces"
Type: fix This reverts commit 5a48b3b9d88fa2793793e2bf3db8bf156fe2951f. Change-Id: Ifa91b18bdbbc32bb729abc09d95637d9cdf42c3b Signed-off-by: Damjan Marion <damarion@cisco.com> Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
Diffstat (limited to 'src/vlib/node_init.c')
-rw-r--r--src/vlib/node_init.c22
1 files changed, 4 insertions, 18 deletions
diff --git a/src/vlib/node_init.c b/src/vlib/node_init.c
index 232eeb35e3c..265e88f525c 100644
--- a/src/vlib/node_init.c
+++ b/src/vlib/node_init.c
@@ -40,7 +40,6 @@
#include <sys/types.h>
#include <fcntl.h>
#include <vlib/vlib.h>
-#include <vnet/vnet.h>
typedef struct _vlib_node_march_variant
{
@@ -90,9 +89,9 @@ unformat_vlib_node_variant (unformat_input_t * input, va_list * args)
}
static_always_inline void
-vlib_update_nr_variant_default (vlib_node_fn_registration_t * fnr,
- u8 * variant)
+vlib_update_nr_variant_default (vlib_node_registration_t *nr, u8 *variant)
{
+ vlib_node_fn_registration_t *fnr = nr->node_fn_registrations;
vlib_node_fn_registration_t *p_reg = 0;
vlib_node_fn_registration_t *v_reg = 0;
u32 tmp;
@@ -128,8 +127,6 @@ vlib_early_node_config (vlib_main_t * vm, unformat_input_t * input)
{
clib_error_t *error = 0;
vlib_node_registration_t *nr, **all;
- vnet_device_class_t *c;
- vnet_main_t *vnm = vnet_get_main ();
unformat_input_t sub_input;
uword *hash = 0, *p;
u8 *variant = 0;
@@ -164,20 +161,10 @@ vlib_early_node_config (vlib_main_t * vm, unformat_input_t * input)
nr = vm->node_main.node_registrations;
while (nr)
{
- vlib_update_nr_variant_default (nr->node_fn_registrations,
- variant);
+ vlib_update_nr_variant_default (nr, variant);
nr = nr->next_registration;
}
- /* also apply it to interfaces */
- c = vnm->device_class_registrations;
- while (c)
- {
- vlib_update_nr_variant_default (c->tx_fn_registrations,
- variant);
- c = c->next_class_registration;
- }
-
vec_free (variant);
}
}
@@ -205,8 +192,7 @@ vlib_early_node_config (vlib_main_t * vm, unformat_input_t * input)
"please specify a valid node variant");
vec_add1 (variant, 0);
- vlib_update_nr_variant_default (nr->node_fn_registrations,
- variant);
+ vlib_update_nr_variant_default (nr, variant);
vec_free (variant);
}