Add config option to use dlmalloc instead of mheap

[vpp.git] / src / vnet / classify / vnet_classify.h

diff --git a/src/vnet/classify/vnet_classify.h b/src/vnet/classify/vnet_classify.h
index 4062801..791b8fd 100644 (file)
--- a/src/vnet/classify/vnet_classify.h
+++ b/src/vnet/classify/vnet_classify.h
@@ -27,6 +27,7 @@
 #include <vnet/ip/ip6_packet.h>
 #include <vlib/cli.h>
 #include <vnet/l2/l2_input.h>
+#include <vnet/l2/l2_output.h>
 #include <vnet/l2/feat_bitmap.h>
 #include <vnet/api_errno.h>    /* for API error numbers */
 
@@ -40,10 +41,6 @@ extern vlib_node_registration_t ip6_classify_node;
 
 #define CLASSIFY_TRACE 0
 
-#if !defined( __aarch64__) && !defined(__arm__)
-#define CLASSIFY_USE_SSE       //Allow usage of SSE operations
-#endif
-
 #define U32X4_ALIGNED(p) PREDICT_TRUE((((intptr_t)p) & 0xf) == 0)
 
 /*
@@ -232,7 +229,7 @@ vnet_classify_hash_packet_inline (vnet_classify_table_t * t, u8 * h)
 
   ASSERT (t);
   mask = t->mask;
-#ifdef CLASSIFY_USE_SSE
+#ifdef CLIB_HAVE_VEC128
   if (U32X4_ALIGNED (h))
     {                          //SSE can't handle unaligned data
       u32x4 *data = (u32x4 *) h;
@@ -258,7 +255,7 @@ vnet_classify_hash_packet_inline (vnet_classify_table_t * t, u8 * h)
        }
     }
   else
-#endif /* CLASSIFY_USE_SSE */
+#endif /* CLIB_HAVE_VEC128 */
     {
       u32 skip_u64 = t->skip_n_vectors * 2;
       u64 *data64 = (u64 *) h;
@@ -406,7 +403,7 @@ vnet_classify_find_entry_inline (vnet_classify_table_t * t,
 
   v = vnet_classify_entry_at_index (t, v, value_index);
 
-#ifdef CLASSIFY_USE_SSE
+#ifdef CLIB_HAVE_VEC128
   if (U32X4_ALIGNED (h))
     {
       u32x4 *data = (u32x4 *) h;
@@ -451,7 +448,7 @@ vnet_classify_find_entry_inline (vnet_classify_table_t * t,
        }
     }
   else
-#endif /* CLASSIFY_USE_SSE */
+#endif /* CLIB_HAVE_VEC128 */
     {
       u32 skip_u64 = t->skip_n_vectors * 2;
       u64 *data64 = (u64 *) h;