ikev2: add support for custom ipsec-over-udp port

[vpp.git] / src / vppinfra / bihash_8_8.h

diff --git a/src/vppinfra/bihash_8_8.h b/src/vppinfra/bihash_8_8.h
index d70da59..a4a18a1 100644 (file)
--- a/src/vppinfra/bihash_8_8.h
+++ b/src/vppinfra/bihash_8_8.h
@@ -13,6 +13,9 @@
  * limitations under the License.
  */
 #undef BIHASH_TYPE
+#undef BIHASH_KVP_PER_PAGE
+#undef BIHASH_32_64_SVM
+#undef BIHASH_ENABLE_STATS
 
 #define BIHASH_TYPE _8_8
 #define BIHASH_KVP_PER_PAGE 4
@@ -24,10 +27,7 @@
 #include <vppinfra/format.h>
 #include <vppinfra/pool.h>
 #include <vppinfra/xxhash.h>
-
-#if __SSE4_2__
-#include <x86intrin.h>
-#endif
+#include <vppinfra/crc32.h>
 
 /** 8 octet key, 8 octet key value pair */
 typedef struct
@@ -54,8 +54,8 @@ static inline u64
 clib_bihash_hash_8_8 (clib_bihash_kv_8_8_t * v)
 {
   /* Note: to torture-test linear scan, make this fn return a constant */
-#if __SSE4_2__
-  return _mm_crc32_u64 (0, v->key);
+#ifdef clib_crc32c_uses_intrinsics
+  return clib_crc32c ((u8 *) & v->key, 8);
 #else
   return clib_xxhash (v->key);
 #endif