From 8932e450224fccdd8dad8992eb90bfead0ae7a7d Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Fri, 16 Apr 2021 11:49:26 +0200 Subject: interface: interface-output end node rework - rename node to more meaningful name - introduce lookup tables - enable multiarch - quad-loop node - enqqueue to next instead of enqueueing to node Type: improvement Change-Id: Ibb208047ae04bb6cfe56db558d3b8938bc14b4fe Signed-off-by: Damjan Marion --- src/plugins/ct6/ct6.c | 5 ++--- src/plugins/flowprobe/flowprobe.c | 5 ++--- src/plugins/lisp/lisp-gpe/lisp_gpe.c | 4 ++-- src/plugins/mactime/mactime.c | 5 ++--- src/plugins/nsim/nsim.c | 5 ++--- 5 files changed, 10 insertions(+), 14 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/ct6/ct6.c b/src/plugins/ct6/ct6.c index d569a7c3f5b..205cd3f50ef 100644 --- a/src/plugins/ct6/ct6.c +++ b/src/plugins/ct6/ct6.c @@ -226,11 +226,10 @@ VNET_FEATURE_INIT (ct6out2in, static) = /* *INDENT-ON */ /* *INDENT-OFF* */ -VNET_FEATURE_INIT (ct6in2out, static) = -{ +VNET_FEATURE_INIT (ct6in2out, static) = { .arc_name = "interface-output", .node_name = "ct6-in2out", - .runs_before = VNET_FEATURES ("interface-tx"), + .runs_before = VNET_FEATURES ("interface-output-arc-end"), }; /* *INDENT-ON */ diff --git a/src/plugins/flowprobe/flowprobe.c b/src/plugins/flowprobe/flowprobe.c index 2a32fbf027f..ffc43bcd440 100644 --- a/src/plugins/flowprobe/flowprobe.c +++ b/src/plugins/flowprobe/flowprobe.c @@ -60,11 +60,10 @@ VNET_FEATURE_INIT (flow_perpacket_ip6, static) = .runs_before = VNET_FEATURES ("interface-output"), }; -VNET_FEATURE_INIT (flow_perpacket_l2, static) = -{ +VNET_FEATURE_INIT (flow_perpacket_l2, static) = { .arc_name = "interface-output", .node_name = "flowprobe-l2", - .runs_before = VNET_FEATURES ("interface-tx"), + .runs_before = VNET_FEATURES ("interface-output-arc-end"), }; /* *INDENT-ON* */ diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe.c b/src/plugins/lisp/lisp-gpe/lisp_gpe.c index 1f087fd0625..1ae3131323c 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe.c @@ -672,8 +672,8 @@ lisp_gpe_test_send_nsh_packet (u8 * file_name) clib_memcpy_fast (p, pm.packets_read[0], vec_len (pm.packets_read[0])); vlib_buffer_pull (b, sizeof (ethernet_header_t)); - vlib_node_t *n = vlib_get_node_by_name (lgm->vlib_main, - (u8 *) "interface-tx"); + vlib_node_t *n = + vlib_get_node_by_name (lgm->vlib_main, (u8 *) "interface-output-arc-end"); f = vlib_get_frame_to_node (lgm->vlib_main, n->index); u32 *to_next = vlib_frame_vector_args (f); to_next[0] = bi; diff --git a/src/plugins/mactime/mactime.c b/src/plugins/mactime/mactime.c index a2219bebe9a..b8b1884119d 100644 --- a/src/plugins/mactime/mactime.c +++ b/src/plugins/mactime/mactime.c @@ -472,11 +472,10 @@ VNET_FEATURE_INIT (mactime, static) = /* *INDENT-ON */ /* *INDENT-OFF* */ -VNET_FEATURE_INIT (mactime_tx, static) = -{ +VNET_FEATURE_INIT (mactime_tx, static) = { .arc_name = "interface-output", .node_name = "mactime-tx", - .runs_before = VNET_FEATURES ("interface-tx"), + .runs_before = VNET_FEATURES ("interface-output-arc-end"), }; /* *INDENT-ON */ diff --git a/src/plugins/nsim/nsim.c b/src/plugins/nsim/nsim.c index 272067382d8..fc8ffebd4a2 100644 --- a/src/plugins/nsim/nsim.c +++ b/src/plugins/nsim/nsim.c @@ -559,11 +559,10 @@ VNET_FEATURE_INIT (nsim, static) = /* *INDENT-ON */ /* *INDENT-OFF* */ -VNET_FEATURE_INIT (nsim_feature, static) = -{ +VNET_FEATURE_INIT (nsim_feature, static) = { .arc_name = "interface-output", .node_name = "nsim-output-feature", - .runs_before = VNET_FEATURES ("interface-tx"), + .runs_before = VNET_FEATURES ("interface-output-arc-end"), }; /* *INDENT-ON */ -- cgit 1.2.3-korg