From 0b2c15dbb039dd19c6cbb3b7dd64f3409c1813c8 Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Mon, 4 Mar 2019 02:52:54 -0800 Subject: adj: migrate old MULTIARCH macros to VLIB_NODE_FN Change-Id: Iac92a6d15e1feef4d97b8db09fc60901dc9f7880 Signed-off-by: Filip Tehlar --- src/vnet/adj/adj_l2.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/vnet/adj/adj_l2.c') diff --git a/src/vnet/adj/adj_l2.c b/src/vnet/adj/adj_l2.c index 09bf468ac40..8a2126b2d7f 100644 --- a/src/vnet/adj/adj_l2.c +++ b/src/vnet/adj/adj_l2.c @@ -152,16 +152,14 @@ adj_l2_rewrite_inline (vlib_main_t * vm, return frame->n_vectors; } -static uword -adj_l2_rewrite (vlib_main_t * vm, +VLIB_NODE_FN (adj_l2_rewrite_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { return adj_l2_rewrite_inline (vm, node, frame, 0); } -static uword -adj_l2_midchain (vlib_main_t * vm, +VLIB_NODE_FN (adj_l2_midchain_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { @@ -169,7 +167,6 @@ adj_l2_midchain (vlib_main_t * vm, } VLIB_REGISTER_NODE (adj_l2_rewrite_node) = { - .function = adj_l2_rewrite, .name = "adj-l2-rewrite", .vector_size = sizeof (u32), @@ -181,10 +178,7 @@ VLIB_REGISTER_NODE (adj_l2_rewrite_node) = { }, }; -VLIB_NODE_FUNCTION_MULTIARCH (adj_l2_rewrite_node, adj_l2_rewrite) - VLIB_REGISTER_NODE (adj_l2_midchain_node) = { - .function = adj_l2_midchain, .name = "adj-l2-midchain", .vector_size = sizeof (u32), @@ -195,5 +189,3 @@ VLIB_REGISTER_NODE (adj_l2_midchain_node) = { [ADJ_L2_REWRITE_NEXT_DROP] = "error-drop", }, }; - -VLIB_NODE_FUNCTION_MULTIARCH (adj_l2_midchain_node, adj_l2_midchain) -- cgit 1.2.3-korg