Minor optimzation/cleanup to ethernet-input node

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

diff --git a/src/vnet/ethernet/node.c b/src/vnet/ethernet/node.c
index 3760877..55d8285 100755 (executable)
--- a/src/vnet/ethernet/node.c
+++ b/src/vnet/ethernet/node.c
@@ -236,10 +236,10 @@ determine_next_node (ethernet_main_t * em,
     }
   else if (is_l20)
     {
-      *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;
+      *next0 = em->l2_next;
       ASSERT (vnet_buffer (b0)->l2.l2_len ==
              ethernet_buffer_header_size (b0));
       vlib_buffer_advance (b0, -ethernet_buffer_header_size (b0));
@@ -285,29 +285,6 @@ determine_next_node (ethernet_main_t * em,
     }
 }
 
-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,
-                                               /* duplicate for type1 */
-                                               ETHERNET_TYPE_VLAN,
-                                               ETHERNET_TYPE_DOT1AD,
-                                               ETHERNET_TYPE_VLAN_9100,
-                                               ETHERNET_TYPE_VLAN_9200);
-
-  __m128i r =
-    _mm_set_epi16 (type0, type0, type0, type0, type1, type1, type1, type1);
-  r = _mm_cmpeq_epi16 (ethertype_mask, r);
-  return !_mm_test_all_zeros (r, r);
-#else
-  return ethernet_frame_is_tagged (type0) || ethernet_frame_is_tagged (type1);
-#endif
-}
-
 static_always_inline uword
 ethernet_input_inline (vlib_main_t * vm,
                       vlib_node_runtime_t * node,
@@ -400,7 +377,8 @@ ethernet_input_inline (vlib_main_t * vm,
 
          /* Speed-path for the untagged case */
          if (PREDICT_TRUE (variant == ETHERNET_INPUT_VARIANT_ETHERNET
-                           && !ethernet_frame_is_any_tagged (type0, type1)))
+                           && !ethernet_frame_is_any_tagged_x2 (type0,
+                                                                type1)))
            {
              main_intf_t *intf0;
              subint_config_t *subint0;
@@ -452,12 +430,12 @@ ethernet_input_inline (vlib_main_t * vm,
                      (hi->hw_address != 0) &&
                      !eth_mac_equal ((u8 *) e1, hi->hw_address))
                    error1 = ETHERNET_ERROR_L3_MAC_MISMATCH;
+                 vlib_buffer_advance (b0, sizeof (ethernet_header_t));
                  determine_next_node (em, variant, 0, type0, b0,
                                       &error0, &next0);
-                 vlib_buffer_advance (b0, sizeof (ethernet_header_t));
+                 vlib_buffer_advance (b1, sizeof (ethernet_header_t));
                  determine_next_node (em, variant, 0, type1, b1,
                                       &error1, &next1);
-                 vlib_buffer_advance (b1, sizeof (ethernet_header_t));
                }
              goto ship_it01;
            }