X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fl2%2Fl2_input_node.c;h=74625b2ec991b4df8b1429f3e8d758caa063ffbc;hb=3be9164f8;hp=898e16ab347da21606a85090ba4f79f7dbb1d733;hpb=47a3d9975fa3af7a7537b565d6511dadc0df61fb;p=vpp.git

diff --git a/src/vnet/l2/l2_input_node.c b/src/vnet/l2/l2_input_node.c
index 898e16ab347..74625b2ec99 100644
--- a/src/vnet/l2/l2_input_node.c
+++ b/src/vnet/l2/l2_input_node.c
@@ -20,9 +20,8 @@
 #include <vnet/pg/pg.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ethernet/packet.h>
-#include <vnet/ip/ip_packet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
+#include <vnet/ip/ip4.h>
+#include <vnet/ip/ip6.h>
 #include <vnet/fib/fib_node.h>
 #include <vnet/ethernet/arp_packet.h>
 #include <vlib/cli.h>
@@ -53,7 +52,6 @@ typedef struct
 {
   /* per-pkt trace data */
   u8 dst_and_src[12];
-  u32 next_index;
   u32 sw_if_index;
   u32 feat_mask;
 } l2input_trace_t;
@@ -143,9 +141,8 @@ classify_and_dispatch (l2input_main_t * msm, vlib_buffer_t * b0, u16 * next0)
       u8 protocol = ((ip6_header_t *) l3h0)->protocol;
 
       /* Disable bridge forwarding (flooding will execute instead if not xconnect) */
-      feat_mask &= ~(L2INPUT_FEAT_FWD |
-		     L2INPUT_FEAT_UU_FLOOD |
-		     L2INPUT_FEAT_UU_FWD | L2INPUT_FEAT_GBP_FWD);
+      feat_mask &=
+	~(L2INPUT_FEAT_FWD | L2INPUT_FEAT_UU_FLOOD | L2INPUT_FEAT_UU_FWD);
 
       if (ethertype != ETHERNET_TYPE_ARP)
 	feat_mask &= ~(L2INPUT_FEAT_ARP_UFWD);
@@ -237,14 +234,12 @@ l2input_node_inline (vlib_main_t * vm,
 		     int do_trace)
 {
   u32 n_left, *from;
-  l2input_next_t next_index;
   l2input_main_t *msm = &l2input_main;
   vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b = bufs;
   u16 nexts[VLIB_FRAME_SIZE], *next = nexts;
 
   from = vlib_frame_vector_args (frame);
   n_left = frame->n_vectors;	/* number of packets to process */
-  next_index = node->cached_next_index;
 
   vlib_get_buffers (vm, from, bufs, n_left);
 
@@ -262,10 +257,10 @@ l2input_node_inline (vlib_main_t * vm,
 	    vlib_prefetch_buffer_header (b[6], LOAD);
 	    vlib_prefetch_buffer_header (b[7], LOAD);
 
-	    CLIB_PREFETCH (b[4]->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (b[5]->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (b[6]->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (b[7]->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    clib_prefetch_store (b[4]->data);
+	    clib_prefetch_store (b[5]->data);
+	    clib_prefetch_store (b[6]->data);
+	    clib_prefetch_store (b[7]->data);
 	  }
 
 	  classify_and_dispatch (msm, b[0], &next[0]);