X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbonding%2Fnode.c;h=d9450692138a24fa191d305af701e463861434f2;hb=ad9d528;hp=ba3e8e32a369494c0e9420788449d6fa5dbfe3c7;hpb=7d98a12f29d5b9696df98b8af2f128614a4f0360;p=vpp.git

diff --git a/src/vnet/bonding/node.c b/src/vnet/bonding/node.c
index ba3e8e32a36..d9450692138 100644
--- a/src/vnet/bonding/node.c
+++ b/src/vnet/bonding/node.c
@@ -36,7 +36,6 @@ typedef enum
     BOND_INPUT_N_ERROR,
 } bond_input_error_t;
 
-#ifndef CLIB_MARCH_VARIANT
 static char *bond_input_error_strings[] = {
 #define _(n,s) s,
   foreach_bond_input_error
@@ -60,8 +59,6 @@ format_bond_input_trace (u8 * s, va_list * args)
 
   return s;
 }
-#endif
-
 
 typedef enum
 {
@@ -205,14 +202,10 @@ VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
       /* Prefetch next iteration */
       if (PREDICT_TRUE (n_left >= 16))
 	{
-	  CLIB_PREFETCH (vlib_buffer_get_current (b[8]),
-			 CLIB_CACHE_LINE_BYTES, LOAD);
-	  CLIB_PREFETCH (vlib_buffer_get_current (b[9]),
-			 CLIB_CACHE_LINE_BYTES, LOAD);
-	  CLIB_PREFETCH (vlib_buffer_get_current (b[10]),
-			 CLIB_CACHE_LINE_BYTES, LOAD);
-	  CLIB_PREFETCH (vlib_buffer_get_current (b[11]),
-			 CLIB_CACHE_LINE_BYTES, LOAD);
+	  vlib_prefetch_buffer_data (b[8], LOAD);
+	  vlib_prefetch_buffer_data (b[9], LOAD);
+	  vlib_prefetch_buffer_data (b[10], LOAD);
+	  vlib_prefetch_buffer_data (b[11], LOAD);
 
 	  vlib_prefetch_buffer_header (b[12], LOAD);
 	  vlib_prefetch_buffer_header (b[13], LOAD);
@@ -337,8 +330,8 @@ VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
 	    {
 	      t0 = vlib_add_trace (vm, node, b[0], sizeof (*t0));
 	      t0->sw_if_index = sw_if_index[0];
-	      clib_memcpy (&t0->ethernet, vlib_buffer_get_current (b[0]),
-			   sizeof (ethernet_header_t));
+	      clib_memcpy_fast (&t0->ethernet, vlib_buffer_get_current (b[0]),
+				sizeof (ethernet_header_t));
 	      t0->bond_sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_RX];
 	    }
 	  /* next */
@@ -360,7 +353,6 @@ VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
   return frame->n_vectors;
 }
 
-#ifndef CLIB_MARCH_VARIANT
 static clib_error_t *
 bond_input_init (vlib_main_t * vm)
 {
@@ -457,7 +449,6 @@ bond_hw_interface_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
 }
 
 VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (bond_hw_interface_up_down);
-#endif
 
 /*
  * fd.io coding-style-patch-verification: ON