From f91098e49cd9ea65cfecabf3832cbb88316c4429 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 9 Mar 2021 16:28:15 +0100 Subject: interface: fix interface-output and interface-tx multiarch selection Type: fix Change-Id: I77723dcbf753c2a7f1ec00f034d8ab604f12214b Signed-off-by: Damjan Marion --- src/vnet/interface_output.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'src/vnet/interface_output.c') diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c index 641bd928d59..d2447658983 100644 --- a/src/vnet/interface_output.c +++ b/src/vnet/interface_output.c @@ -480,12 +480,8 @@ static_always_inline void vnet_interface_pcap_tx_trace } } -static vlib_node_function_t CLIB_MULTIARCH_FN (vnet_interface_output_node); - -static uword -CLIB_MULTIARCH_FN (vnet_interface_output_node) (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (vnet_interface_output_node) +(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame) { vnet_main_t *vnm = vnet_get_main (); vnet_hw_interface_t *hi; @@ -503,15 +499,10 @@ CLIB_MULTIARCH_FN (vnet_interface_output_node) (vlib_main_t * vm, /* do_tx_offloads */ 1); } -CLIB_MARCH_FN_REGISTRATION (vnet_interface_output_node); - -#ifndef CLIB_MARCH_VARIANT -vlib_node_function_t * -vnet_interface_output_node_get (void) -{ - return CLIB_MARCH_FN_POINTER (vnet_interface_output_node); -} -#endif /* CLIB_MARCH_VARIANT */ +VLIB_REGISTER_NODE (vnet_interface_output_node) = { + .name = "interface-output-template", + .vector_size = sizeof (u32), +}; /* Use buffer's sw_if_index[VNET_TX] to choose output interface. */ VLIB_NODE_FN (vnet_per_buffer_interface_output_node) (vlib_main_t * vm, -- cgit 1.2.3-korg