X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fnat66_in2out.c;h=ac1f329841591bae7cd631af9e035c17a324c26a;hb=ca76831df3b6abd3c4af6381b873d9f589f20af7;hp=d606bf46260b474386a12660e70e8e74853c455a;hpb=9341e34b500ce7c68fc6857a24ee7b67cac121b1;p=vpp.git

diff --git a/src/plugins/nat/nat66_in2out.c b/src/plugins/nat/nat66_in2out.c
index d606bf46260..ac1f3298415 100644
--- a/src/plugins/nat/nat66_in2out.c
+++ b/src/plugins/nat/nat66_in2out.c
@@ -41,8 +41,6 @@ format_nat66_in2out_trace (u8 * s, va_list * args)
   return s;
 }
 
-vlib_node_registration_t nat66_in2out_node;
-
 #define foreach_nat66_in2out_error                       \
 _(IN2OUT_PACKETS, "good in2out packets processed")       \
 _(NO_TRANSLATION, "no translation")                      \
@@ -109,14 +107,14 @@ nat66_not_translate (u32 rx_fib_index, ip6_address_t ip6_addr)
   return 1;
 }
 
-static inline uword
-nat66_in2out_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-		      vlib_frame_t * frame)
+VLIB_NODE_FN (nat66_in2out_node) (vlib_main_t * vm,
+				  vlib_node_runtime_t * node,
+				  vlib_frame_t * frame)
 {
   u32 n_left_from, *from, *to_next;
   nat66_in2out_next_t next_index;
   u32 pkts_processed = 0;
-  u32 thread_index = vlib_get_thread_index ();
+  u32 thread_index = vm->thread_index;
   nat66_main_t *nm = &nat66_main;
 
   from = vlib_frame_vector_args (frame);
@@ -232,7 +230,7 @@ nat66_in2out_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_in2out_node.index,
+  vlib_node_increment_counter (vm, nm->in2out_node_index,
 			       NAT66_IN2OUT_ERROR_IN2OUT_PACKETS,
 			       pkts_processed);
   return frame->n_vectors;
@@ -240,7 +238,6 @@ nat66_in2out_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (nat66_in2out_node) = {
-  .function = nat66_in2out_node_fn,
   .name = "nat66-in2out",
   .vector_size = sizeof (u32),
   .format_trace = format_nat66_in2out_trace,
@@ -256,8 +253,6 @@ VLIB_REGISTER_NODE (nat66_in2out_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat66_in2out_node, nat66_in2out_node_fn);
-
 /*
  * fd.io coding-style-patch-verification: ON
  *