misc: deprecate gbp and its dependents

[vpp.git] / src / vnet / l2 / l2_input_node.c

diff --git a/src/vnet/l2/l2_input_node.c b/src/vnet/l2/l2_input_node.c
index 59a437e..74625b2 100644 (file)
--- a/src/vnet/l2/l2_input_node.c
+++ b/src/vnet/l2/l2_input_node.c
@@ -141,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);
@@ -258,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]);