X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbonding%2Fnode.c;h=7abd7b0de32e34382065894f6cc1e54ab925d0bb;hb=067cd6229a47ea3ba8b59a2a04090e80afb5bd2c;hp=9479fe98dd0d88a125e6e259b038086b1ae3bc24;hpb=f264f0831f2106cf5f5436bf6b08c45a6c86f2f5;p=vpp.git

diff --git a/src/vnet/bonding/node.c b/src/vnet/bonding/node.c
index 9479fe98dd0..7abd7b0de32 100644
--- a/src/vnet/bonding/node.c
+++ b/src/vnet/bonding/node.c
@@ -67,7 +67,7 @@ typedef enum
 {
   BOND_INPUT_NEXT_DROP,
   BOND_INPUT_N_NEXT,
-} l2output_next_t;
+} bond_output_next_t;
 
 static_always_inline u8
 packet_is_cdp (ethernet_header_t * eth)
@@ -138,7 +138,7 @@ bond_update_next (vlib_main_t * vm, vlib_node_runtime_t * node,
 		  u32 * bond_sw_if_index, vlib_buffer_t * b,
 		  u32 * next_index, vlib_error_t * error)
 {
-  u16 thread_index = vlib_get_thread_index ();
+  u16 thread_index = vm->thread_index;
   slave_if_t *sif;
   bond_if_t *bif;
 
@@ -176,7 +176,7 @@ VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
 				vlib_node_runtime_t * node,
 				vlib_frame_t * frame)
 {
-  u16 thread_index = vlib_get_thread_index ();
+  u16 thread_index = vm->thread_index;
   u32 *from, n_left;
   vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b;
   u32 sw_if_indices[VLIB_FRAME_SIZE], *sw_if_index;
@@ -329,7 +329,6 @@ VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
       n_left = frame->n_vectors;	/* number of packets to process */
       b = bufs;
       sw_if_index = sw_if_indices;
-      next = nexts;
       bond_packet_trace_t *t0;
 
       while (n_left)
@@ -346,7 +345,6 @@ VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
 	  n_left--;
 	  b++;
 	  sw_if_index++;
-	  next++;
 	}
     }