X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Frewrite.h;h=58d47e0c7370689b5e2f2cea14ef0380dda2385d;hb=refs%2Fchanges%2F16%2F15916%2F4;hp=712f686f4ae8cbe235ae9218727e27a03777fe85;hpb=889fe948df5d53c6210b4db402b8c07d3e45d680;p=vpp.git

diff --git a/src/vnet/adj/rewrite.h b/src/vnet/adj/rewrite.h
index 712f686f4ae..58d47e0c737 100644
--- a/src/vnet/adj/rewrite.h
+++ b/src/vnet/adj/rewrite.h
@@ -115,24 +115,24 @@ struct {								\
 always_inline void
 vnet_rewrite_clear_data_internal (vnet_rewrite_header_t * rw, int max_size)
 {
-  /* Sanity check values carefully for this memset operation */
+  /* Sanity check values carefully for this clib_memset operation */
   ASSERT ((max_size > 0) && (max_size < VLIB_BUFFER_PRE_DATA_SIZE));
 
   rw->data_bytes = 0;
-  memset (rw->data, 0xfe, max_size);
+  clib_memset (rw->data, 0xfe, max_size);
 }
 
 always_inline void
 vnet_rewrite_set_data_internal (vnet_rewrite_header_t * rw,
 				int max_size, void *data, int data_bytes)
 {
-  /* Sanity check values carefully for this memset operation */
+  /* Sanity check values carefully for this clib_memset operation */
   ASSERT ((max_size > 0) && (max_size < VLIB_BUFFER_PRE_DATA_SIZE));
   ASSERT ((data_bytes >= 0) && (data_bytes < max_size));
 
   rw->data_bytes = data_bytes;
-  clib_memcpy (rw->data + max_size - data_bytes, data, data_bytes);
-  memset (rw->data, 0xfe, max_size - data_bytes);
+  clib_memcpy_fast (rw->data + max_size - data_bytes, data, data_bytes);
+  clib_memset (rw->data, 0xfe, max_size - data_bytes);
 }
 
 #define vnet_rewrite_set_data(rw,data,data_bytes)		\
@@ -314,11 +314,12 @@ u32 vnet_tx_node_index_for_sw_interface (struct vnet_main_t *vnm,
 
 void vnet_rewrite_init (struct vnet_main_t *vnm,
 			u32 sw_if_index,
+			vnet_link_t linkt,
 			u32 this_node,
 			u32 next_node, vnet_rewrite_header_t * rw);
 
 void vnet_rewrite_update_mtu (struct vnet_main_t *vnm,
-			      vnet_rewrite_header_t * rw);
+			      vnet_link_t linkt, vnet_rewrite_header_t * rw);
 
 u8 *vnet_build_rewrite_for_sw_interface (struct vnet_main_t *vnm,
 					 u32 sw_if_index,