X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_output.c;h=f8585647c81c197c8599bd67d7884b2c31429c2f;hb=7ac053b27fee8f9e437cf7b61357943356381061;hp=fe029b865fafe6aa14b877614aa6d3a89a4f4693;hpb=537eeeca36dcc08a3c337a7cfd1c1c426d43f563;p=vpp.git

diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c
index fe029b865fa..f8585647c81 100644
--- a/src/vnet/interface_output.c
+++ b/src/vnet/interface_output.c
@@ -328,10 +328,10 @@ vnet_interface_output_node_inline (vlib_main_t * vm,
 
 	  if (PREDICT_FALSE (current_config_index != ~0))
 	    {
-	      b0->feature_arc_index = arc;
-	      b1->feature_arc_index = arc;
-	      b2->feature_arc_index = arc;
-	      b3->feature_arc_index = arc;
+	      vnet_buffer (b0)->feature_arc_index = arc;
+	      vnet_buffer (b1)->feature_arc_index = arc;
+	      vnet_buffer (b2)->feature_arc_index = arc;
+	      vnet_buffer (b3)->feature_arc_index = arc;
 	      b0->current_config_index = current_config_index;
 	      b1->current_config_index = current_config_index;
 	      b2->current_config_index = current_config_index;
@@ -415,7 +415,7 @@ vnet_interface_output_node_inline (vlib_main_t * vm,
 
 	  if (PREDICT_FALSE (current_config_index != ~0))
 	    {
-	      b0->feature_arc_index = arc;
+	      vnet_buffer (b0)->feature_arc_index = arc;
 	      b0->current_config_index = current_config_index;
 	    }
 
@@ -443,7 +443,7 @@ vnet_interface_output_node_inline (vlib_main_t * vm,
   return n_buffers;
 }
 
-static_always_inline uword
+static uword
 vnet_interface_output_node (vlib_main_t * vm, vlib_node_runtime_t * node,
 			    vlib_frame_t * frame)
 {
@@ -1157,7 +1157,7 @@ pcap_drop_trace_command_fn (vlib_main_t * vm,
 	      if (im->pcap_filename == 0)
 		im->pcap_filename = format (0, "/tmp/drop.pcap%c", 0);
 
-	      memset (&im->pcap_main, 0, sizeof (im->pcap_main));
+	      clib_memset (&im->pcap_main, 0, sizeof (im->pcap_main));
 	      im->pcap_main.file_name = (char *) im->pcap_filename;
 	      im->pcap_main.n_packets_to_capture = 100;
 	      if (im->pcap_pkts_to_capture)