From c3a0e8d2d255c0925d1ec17aba8c8892d532b040 Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Mon, 11 Mar 2019 05:53:35 -0700 Subject: deprecate VLIB_NODE_FUNCTION_MULTIARCH Change-Id: I403173846bc5b1bbbe2a2c41225b0f666f851cb9 Signed-off-by: Filip Tehlar --- src/vnet/ethernet/p2p_ethernet_input.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/vnet/ethernet/p2p_ethernet_input.c') diff --git a/src/vnet/ethernet/p2p_ethernet_input.c b/src/vnet/ethernet/p2p_ethernet_input.c index 2cae97d7ba9..36845fcda1b 100644 --- a/src/vnet/ethernet/p2p_ethernet_input.c +++ b/src/vnet/ethernet/p2p_ethernet_input.c @@ -24,10 +24,10 @@ #include #include -vlib_node_registration_t p2p_ethernet_input_node; +extern vlib_node_registration_t p2p_ethernet_input_node; /* packet trace format function */ -u8 * +static u8 * format_p2p_ethernet_trace (u8 * s, va_list * args) { CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); @@ -59,9 +59,9 @@ static char *p2p_ethernet_error_strings[] = { #undef _ }; -static uword -p2p_ethernet_input_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (p2p_ethernet_input_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { u32 thread_index = vm->thread_index; u32 n_trace = vlib_get_trace_count (vm, node); @@ -233,7 +233,6 @@ p2p_ethernet_input_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (p2p_ethernet_input_node) = { - .function = p2p_ethernet_input_node_fn, .name = "p2p-ethernet-input", .vector_size = sizeof (u32), .format_trace = format_p2p_ethernet_trace, @@ -251,8 +250,6 @@ VLIB_REGISTER_NODE (p2p_ethernet_input_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (p2p_ethernet_input_node, - p2p_ethernet_input_node_fn) /* * fd.io coding-style-patch-verification: ON * -- cgit 1.2.3-korg