dev: new device driver infra

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

diff --git a/src/vnet/l2/l2_fwd.c b/src/vnet/l2/l2_fwd.c
index e7accc2..1ee3a53 100644 (file)
--- a/src/vnet/l2/l2_fwd.c
+++ b/src/vnet/l2/l2_fwd.c
@@ -215,8 +215,7 @@ l2fwd_process (vlib_main_t * vm,
        * unless some other feature is inserted before uu_flood
        */
       if (vnet_buffer (b0)->l2.feature_bitmap &
-         (L2INPUT_FEAT_UU_FLOOD |
-          L2INPUT_FEAT_UU_FWD | L2INPUT_FEAT_GBP_FWD))
+         (L2INPUT_FEAT_UU_FLOOD | L2INPUT_FEAT_UU_FWD))
        {
          *next0 = vnet_l2_feature_next (b0, msm->feat_next_node_index,
                                         L2INPUT_FEAT_FWD);
@@ -269,10 +268,10 @@ l2fwd_node_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
        vlib_prefetch_buffer_header (b[6], LOAD);
        vlib_prefetch_buffer_header (b[7], LOAD);
 
-       CLIB_PREFETCH (b[4]->data, CLIB_CACHE_LINE_BYTES, LOAD);
-       CLIB_PREFETCH (b[5]->data, CLIB_CACHE_LINE_BYTES, LOAD);
-       CLIB_PREFETCH (b[6]->data, CLIB_CACHE_LINE_BYTES, LOAD);
-       CLIB_PREFETCH (b[7]->data, CLIB_CACHE_LINE_BYTES, LOAD);
+       clib_prefetch_load (b[4]->data);
+       clib_prefetch_load (b[5]->data);
+       clib_prefetch_load (b[6]->data);
+       clib_prefetch_load (b[7]->data);
       }
 
       /* RX interface handles */