From 44f0f71b6b1e6dac466452664817abc388662efd Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Mon, 11 Mar 2019 04:26:37 -0700 Subject: l2: migrate old MULTIARCH macros to VLIB_NODE_FN Change-Id: I8370c06150ce4499475e9d6dc6b3ab8be2016202 Signed-off-by: Filip Tehlar --- src/vnet/l2/l2_uu_fwd.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/vnet/l2/l2_uu_fwd.c') diff --git a/src/vnet/l2/l2_uu_fwd.c b/src/vnet/l2/l2_uu_fwd.c index fd79387bbe0..fb3571d159c 100644 --- a/src/vnet/l2/l2_uu_fwd.c +++ b/src/vnet/l2/l2_uu_fwd.c @@ -59,9 +59,9 @@ format_l2_uu_fwd_trace (u8 * s, va_list * args) return s; } -static uword -l2_uu_fwd_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (l2_uu_fwd_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { u32 n_left_from, *from, *to_next; l2_uu_fwd_next_t next_index; @@ -212,8 +212,7 @@ l2_uu_fwd_node_fn (vlib_main_t * vm, } /* *INDENT-OFF* */ -VLIB_REGISTER_NODE (l2_uu_fwd_node,static) = { - .function = l2_uu_fwd_node_fn, +VLIB_REGISTER_NODE (l2_uu_fwd_node) = { .name = "l2-uu-fwd", .vector_size = sizeof (u32), .format_trace = format_l2_uu_fwd_trace, @@ -229,8 +228,6 @@ VLIB_REGISTER_NODE (l2_uu_fwd_node,static) = { [L2_UU_FWD_NEXT_L2_OUTPUT] = "l2-output", }, }; - -VLIB_NODE_FUNCTION_MULTIARCH (l2_uu_fwd_node, l2_uu_fwd_node_fn) /* *INDENT-ON* */ /* -- cgit 1.2.3-korg