Fix clang implicit conversion errors

[vpp.git] / src / vnet / ethernet / node.c

diff --git a/src/vnet/ethernet/node.c b/src/vnet/ethernet/node.c
index f216216..3b85483 100755 (executable)
--- a/src/vnet/ethernet/node.c
+++ b/src/vnet/ethernet/node.c
@@ -103,6 +103,7 @@ parse_header (ethernet_input_variant_t variant,
       e0 = (void *) (b0->data + b0->current_data);
 
       vnet_buffer (b0)->l2_hdr_offset = b0->current_data;
+      b0->flags |= VNET_BUFFER_F_L2_HDR_OFFSET_VALID;
 
       vlib_buffer_advance (b0, sizeof (e0[0]));
 
@@ -228,6 +229,8 @@ determine_next_node (ethernet_main_t * em,
                     u32 is_l20,
                     u32 type0, vlib_buffer_t * b0, u8 * error0, u8 * next0)
 {
+  u32 eth_start = vnet_buffer (b0)->l2_hdr_offset;
+  vnet_buffer (b0)->l2.l2_len = b0->current_data - eth_start;
   if (PREDICT_FALSE (*error0 != ETHERNET_ERROR_NONE))
     {
       // some error occurred
@@ -237,8 +240,6 @@ determine_next_node (ethernet_main_t * em,
     {
       *next0 = em->l2_next;
       // record the L2 len and reset the buffer so the L2 header is preserved
-      u32 eth_start = vnet_buffer (b0)->l2_hdr_offset;
-      vnet_buffer (b0)->l2.l2_len = b0->current_data - eth_start;
       ASSERT (vnet_buffer (b0)->l2.l2_len ==
              ethernet_buffer_header_size (b0));
       vlib_buffer_advance (b0, -ethernet_buffer_header_size (b0));
@@ -288,14 +289,15 @@ static_always_inline int
 ethernet_frame_is_any_tagged (u16 type0, u16 type1)
 {
 #if __SSE4_2__
-  const __m128i ethertype_mask = _mm_set_epi16 (ETHERNET_TYPE_VLAN,
-                                               ETHERNET_TYPE_DOT1AD,
-                                               ETHERNET_TYPE_VLAN_9100,
-                                               ETHERNET_TYPE_VLAN_9200,
+  const __m128i ethertype_mask = _mm_set_epi16 ((u16) ETHERNET_TYPE_VLAN,
+                                               (u16) ETHERNET_TYPE_DOT1AD,
+                                               (u16) ETHERNET_TYPE_VLAN_9100,
+                                               (u16) ETHERNET_TYPE_VLAN_9200,
                                                /* duplicate for type1 */
-                                               ETHERNET_TYPE_VLAN,
-                                               ETHERNET_TYPE_DOT1AD,
-                                               ETHERNET_TYPE_VLAN_9100,
+                                               (u16) ETHERNET_TYPE_VLAN,
+                                               (u16) ETHERNET_TYPE_DOT1AD,
+                                               (u16) ETHERNET_TYPE_VLAN_9100,
+                                               (u16)
                                                ETHERNET_TYPE_VLAN_9200);
 
   __m128i r =
@@ -425,6 +427,14 @@ ethernet_input_inline (vlib_main_t * vm,
 
              vnet_buffer (b0)->l2_hdr_offset = b0->current_data;
              vnet_buffer (b1)->l2_hdr_offset = b1->current_data;
+             vnet_buffer (b0)->l3_hdr_offset =
+               vnet_buffer (b0)->l2_hdr_offset + sizeof (ethernet_header_t);
+             vnet_buffer (b1)->l3_hdr_offset =
+               vnet_buffer (b1)->l2_hdr_offset + sizeof (ethernet_header_t);
+             b0->flags |= VNET_BUFFER_F_L2_HDR_OFFSET_VALID |
+               VNET_BUFFER_F_L3_HDR_OFFSET_VALID;
+             b1->flags |= VNET_BUFFER_F_L2_HDR_OFFSET_VALID |
+               VNET_BUFFER_F_L3_HDR_OFFSET_VALID;
 
              if (PREDICT_TRUE (is_l20 != 0))
                {
@@ -573,6 +583,12 @@ ethernet_input_inline (vlib_main_t * vm,
                               &next0);
          determine_next_node (em, variant, is_l21, type1, b1, &error1,
                               &next1);
+         vnet_buffer (b0)->l3_hdr_offset = vnet_buffer (b0)->l2_hdr_offset +
+           vnet_buffer (b0)->l2.l2_len;
+         vnet_buffer (b1)->l3_hdr_offset = vnet_buffer (b1)->l2_hdr_offset +
+           vnet_buffer (b1)->l2.l2_len;
+         b0->flags |= VNET_BUFFER_F_L3_HDR_OFFSET_VALID;
+         b1->flags |= VNET_BUFFER_F_L3_HDR_OFFSET_VALID;
 
        ship_it01:
          b0->error = error_node->errors[error0];
@@ -644,6 +660,10 @@ ethernet_input_inline (vlib_main_t * vm,
                }
 
              vnet_buffer (b0)->l2_hdr_offset = b0->current_data;
+             vnet_buffer (b0)->l3_hdr_offset =
+               vnet_buffer (b0)->l2_hdr_offset + sizeof (ethernet_header_t);
+             b0->flags |= VNET_BUFFER_F_L2_HDR_OFFSET_VALID |
+               VNET_BUFFER_F_L3_HDR_OFFSET_VALID;
 
              if (PREDICT_TRUE (is_l20 != 0))
                {
@@ -741,6 +761,9 @@ ethernet_input_inline (vlib_main_t * vm,
 
          determine_next_node (em, variant, is_l20, type0, b0, &error0,
                               &next0);
+         vnet_buffer (b0)->l3_hdr_offset = vnet_buffer (b0)->l2_hdr_offset +
+           vnet_buffer (b0)->l2.l2_len;
+         b0->flags |= VNET_BUFFER_F_L3_HDR_OFFSET_VALID;
 
        ship_it0:
          b0->error = error_node->errors[error0];