NAT: VPP-1552 code migration from old multiarch scheme

[vpp.git] / src / plugins / nat / nat66_out2in.c

diff --git a/src/plugins/nat/nat66_out2in.c b/src/plugins/nat/nat66_out2in.c
index f264765..d404d9f 100644 (file)
--- a/src/plugins/nat/nat66_out2in.c
+++ b/src/plugins/nat/nat66_out2in.c
@@ -41,8 +41,6 @@ format_nat66_out2in_trace (u8 * s, va_list * args)
   return s;
 }
 
-vlib_node_registration_t nat66_out2in_node;
-
 #define foreach_nat66_out2in_error                       \
 _(OUT2IN_PACKETS, "good out2in packets processed")       \
 _(NO_TRANSLATION, "no translation")                      \
@@ -69,9 +67,9 @@ typedef enum
   NAT66_OUT2IN_N_NEXT,
 } nat66_out2in_next_t;
 
-static inline uword
-nat66_out2in_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-                     vlib_frame_t * frame)
+VLIB_NODE_FN (nat66_out2in_node) (vlib_main_t * vm,
+                                 vlib_node_runtime_t * node,
+                                 vlib_frame_t * frame)
 {
   u32 n_left_from, *from, *to_next;
   nat66_out2in_next_t next_index;
@@ -190,7 +188,7 @@ nat66_out2in_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
-  vlib_node_increment_counter (vm, nat66_out2in_node.index,
+  vlib_node_increment_counter (vm, nm->out2in_node_index,
                               NAT66_OUT2IN_ERROR_OUT2IN_PACKETS,
                               pkts_processed);
   return frame->n_vectors;
@@ -198,7 +196,6 @@ nat66_out2in_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (nat66_out2in_node) = {
-  .function = nat66_out2in_node_fn,
   .name = "nat66-out2in",
   .vector_size = sizeof (u32),
   .format_trace = format_nat66_out2in_trace,
@@ -214,8 +211,6 @@ VLIB_REGISTER_NODE (nat66_out2in_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat66_out2in_node, nat66_out2in_node_fn);
-
 /*
  * fd.io coding-style-patch-verification: ON
  *