session: segment manager improvements
[vpp.git] / src / vnet / l2 / l2_bvi.h
index dd1130a..662ec40 100644 (file)
@@ -57,7 +57,7 @@ l2_to_bvi (vlib_main_t * vlib_main,
     }
 
   /* Save L2 header position which may be changed due to packet replication */
-  vnet_buffer (b0)->ethernet.start_of_ethernet_header = b0->current_data;
+  vnet_buffer (b0)->l2_hdr_offset = b0->current_data;
 
   /* Strip L2 header */
   l2_len = vnet_buffer (b0)->l2.l2_len;
@@ -97,7 +97,7 @@ l2_to_bvi (vlib_main_t * vlib_main,
   vlib_increment_combined_counter
     (vnet_main->interface_main.combined_sw_if_counters
      + VNET_INTERFACE_COUNTER_RX,
-     vlib_main->cpu_index,
+     vlib_main->thread_index,
      vnet_buffer (b0)->sw_if_index[VLIB_RX],
      1, vlib_buffer_length_in_chain (vlib_main, b0));
   return TO_BVI_ERR_OK;