commit 17fcd989f417555b1c2edfe626add5cc6f620812
author Filip Tehlar <ftehlar@cisco.com> Tue Mar 05 04:32:11 2019 -0800
committer Neale Ranns <nranns@cisco.com> Tue Mar 05 14:08:26 2019 +0000
tree 7d6afd7ac844f22a15aa9a9d6f87bae989040cac
parent 32f6d8e0ca39483f706dc3a1c28223e9fe028f06

mpls: migrate old MULTIARCH macros to VLIB_NODE_FN

Change-Id: I8c5f7cda655e3343d50a96d714796ea4255588b6
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>

src/vnet/mpls/mpls_input.c

diff --git a/src/vnet/mpls/mpls_input.c b/src/vnet/mpls/mpls_input.c
index d77fd4c..1dd5e32 100644
--- a/src/vnet/mpls/mpls_input.c
+++ b/src/vnet/mpls/mpls_input.c
@@ -60,8 +60,6 @@
   return s;
 }
 
-vlib_node_registration_t mpls_input_node;
-
 typedef struct {
   u32 last_label;
   u32 last_inner_fib_index;
@@ -231,8 +229,7 @@
   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 @@
 };
 
 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 @@
   .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 @@
 }
 
 VLIB_INIT_FUNCTION (mpls_input_init);
+#endif /* CLIB_MARCH_VARIANT */