diff options
| author |   Filip Tehlar <ftehlar@cisco.com> | 2019-03-05 04:32:11 -0800 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2019-03-05 14:08:26 +0000 |
| commit | 17fcd989f417555b1c2edfe626add5cc6f620812 (patch) | |
| tree | 7d6afd7ac844f22a15aa9a9d6f87bae989040cac /src/vnet/mpls/mpls_input.c | |
| parent | 32f6d8e0ca39483f706dc3a1c28223e9fe028f06 (diff) | |
mpls: migrate old MULTIARCH macros to VLIB_NODE_FN
Change-Id: I8c5f7cda655e3343d50a96d714796ea4255588b6
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/vnet/mpls/mpls_input.c')
| -rw-r--r-- | src/vnet/mpls/mpls_input.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/vnet/mpls/mpls_input.c b/src/vnet/mpls/mpls_input.c index d77fd4cd7e3..1dd5e326a3c 100644 --- a/src/vnet/mpls/mpls_input.c +++ b/src/vnet/mpls/mpls_input.c @@ -60,8 +60,6 @@ format_mpls_input_trace (u8 * s, va_list * args) return s; } -vlib_node_registration_t mpls_input_node; - typedef struct { u32 last_label; u32 last_inner_fib_index; @@ -231,8 +229,7 @@ mpls_input_inline (vlib_main_t * vm, return from_frame->n_vectors; } -static uword -mpls_input (vlib_main_t * vm, +VLIB_NODE_FN (mpls_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) { @@ -246,7 +243,6 @@ static char * mpls_error_strings[] = { }; VLIB_REGISTER_NODE (mpls_input_node) = { - .function = mpls_input, .name = "mpls-input", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -267,8 +263,7 @@ VLIB_REGISTER_NODE (mpls_input_node) = { .format_trace = format_mpls_input_trace, }; -VLIB_NODE_FUNCTION_MULTIARCH (mpls_input_node, mpls_input) - +#ifndef CLIB_MARCH_VARIANT static void mpls_setup_nodes (vlib_main_t * vm) { @@ -295,3 +290,4 @@ static clib_error_t * mpls_input_init (vlib_main_t * vm) } VLIB_INIT_FUNCTION (mpls_input_init); +#endif /* CLIB_MARCH_VARIANT */ |