fib: fix crash while adding intf-rx routes

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

diff --git a/src/vnet/l2/l2_output_classify.c b/src/vnet/l2/l2_output_classify.c
index 1e55afc..97beb37 100644 (file)
--- a/src/vnet/l2/l2_output_classify.c
+++ b/src/vnet/l2/l2_output_classify.c
@@ -172,8 +172,7 @@ VLIB_NODE_FN (l2_output_classify_node) (vlib_main_t * vm,
       int type_index0, type_index1;
       vnet_classify_table_t *t0, *t1;
       u32 table_index0, table_index1;
-      u64 hash0, hash1;
-
+      u32 hash0, hash1;
 
       /* prefetch next iteration */
       {
@@ -183,9 +182,9 @@ VLIB_NODE_FN (l2_output_classify_node) (vlib_main_t * vm,
        p3 = vlib_get_buffer (vm, from[3]);
 
        vlib_prefetch_buffer_header (p2, STORE);
-       CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
+       clib_prefetch_store (p2->data);
        vlib_prefetch_buffer_header (p3, STORE);
-       CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+       clib_prefetch_store (p3->data);
       }
 
       bi0 = from[0];
@@ -257,7 +256,7 @@ VLIB_NODE_FN (l2_output_classify_node) (vlib_main_t * vm,
       u32 type_index0;
       vnet_classify_table_t *t0;
       u32 table_index0;
-      u64 hash0;
+      u32 hash0;
 
       bi0 = from[0];
       b0 = vlib_get_buffer (vm, bi0);
@@ -308,14 +307,14 @@ VLIB_NODE_FN (l2_output_classify_node) (vlib_main_t * vm,
          u32 next0 = ~0;
          ethernet_header_t *h0;
          u32 table_index0;
-         u64 hash0;
+         u32 hash0;
          vnet_classify_table_t *t0;
          vnet_classify_entry_t *e0;
 
          if (PREDICT_TRUE (n_left_from > 2))
            {
              vlib_buffer_t *p2 = vlib_get_buffer (vm, from[2]);
-             u64 phash2;
+             u32 phash2;
              u32 table_index2;
              vnet_classify_table_t *tp2;