Use thread local storage for thread index

[vpp.git] / src / vnet / ip / ip6_input.c

diff --git a/src/vnet/ip/ip6_input.c b/src/vnet/ip/ip6_input.c
index 2030608..ffdc472 100644 (file)
--- a/src/vnet/ip/ip6_input.c
+++ b/src/vnet/ip/ip6_input.c
@@ -82,7 +82,7 @@ ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
   vlib_node_runtime_t *error_node =
     vlib_node_get_runtime (vm, ip6_input_node.index);
   vlib_simple_counter_main_t *cm;
-  u32 cpu_index = os_get_cpu_number ();
+  u32 thread_index = vlib_get_thread_index ();
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -171,8 +171,8 @@ ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
          vnet_feature_arc_start (arc0, sw_if_index0, &next0, p0);
          vnet_feature_arc_start (arc1, sw_if_index1, &next1, p1);
 
-         vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
-         vlib_increment_simple_counter (cm, cpu_index, sw_if_index1, 1);
+         vlib_increment_simple_counter (cm, thread_index, sw_if_index0, 1);
+         vlib_increment_simple_counter (cm, thread_index, sw_if_index1, 1);
 
          error0 = error1 = IP6_ERROR_NONE;
 
@@ -270,7 +270,7 @@ ip6_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
          vnet_buffer (p0)->ip.adj_index[VLIB_RX] = ~0;
          vnet_feature_arc_start (arc0, sw_if_index0, &next0, p0);
 
-         vlib_increment_simple_counter (cm, cpu_index, sw_if_index0, 1);
+         vlib_increment_simple_counter (cm, thread_index, sw_if_index0, 1);
          error0 = IP6_ERROR_NONE;
 
          /* Version != 6?  Drop it. */