acl-plugin: Recreate the bihash_40_8.h in the proper place

Change-Id: I30a3df53bc5fe5ab991a657918eb502bd2913440
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>

4 files changed, 4 insertions, 87 deletions

diff --git a/src/plugins/acl/acl.h b/src/plugins/acl/acl.h
index dcb4e0e9378..26084a66521 100644
--- a/src/plugins/acl/acl.h
+++ b/src/plugins/acl/acl.h
@@ -25,7 +25,8 @@
 #include <vppinfra/bitmap.h>
 #include <vppinfra/elog.h>
 #include <vppinfra/bihash_48_8.h>
-#include "bihash_40_8.h"
+#include <vppinfra/bihash_40_8.h>
+
 #include "fa_node.h"
 #include "hash_lookup_types.h"
 
diff --git a/src/plugins/acl/bihash_40_8.h b/src/plugins/acl/bihash_40_8.h
deleted file mode 100644
index 1dfb6a1eb14..00000000000
--- a/src/plugins/acl/bihash_40_8.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#undef BIHASH_TYPE
-
-#define BIHASH_TYPE _40_8
-#define BIHASH_KVP_PER_PAGE 4
-
-#ifndef __included_bihash_40_8_h__
-#define __included_bihash_40_8_h__
-
-#include <vppinfra/heap.h>
-#include <vppinfra/format.h>
-#include <vppinfra/pool.h>
-#include <vppinfra/xxhash.h>
-#include <vppinfra/crc32.h>
-
-typedef struct
-{
-  u64 key[5];
-  u64 value;
-} clib_bihash_kv_40_8_t;
-
-static inline int
-clib_bihash_is_free_40_8 (const clib_bihash_kv_40_8_t * v)
-{
-  /* Free values are memset to 0xff, check a bit... */
-  if (v->key[0] == ~0ULL && v->value == ~0ULL)
-    return 1;
-  return 0;
-}
-
-static inline u64
-clib_bihash_hash_40_8 (const clib_bihash_kv_40_8_t * v)
-{
-#if __SSE4_2__
-  return clib_crc32c ((u8 *) v->key, 40);
-#else
-  u64 tmp = v->key[0] ^ v->key[1] ^ v->key[2] ^ v->key[3] ^ v->key[4];
-  return clib_xxhash (tmp);
-#endif
-}
-
-static inline u8 *
-format_bihash_kvp_40_8 (u8 * s, va_list * args)
-{
-  clib_bihash_kv_40_8_t *v = va_arg (*args, clib_bihash_kv_40_8_t *);
-
-  s = format (s, "key %llu %llu %llu %llu %llu value %llu",
-	      v->key[0], v->key[1], v->key[2], v->key[3], v->key[4],
-	      v->value);
-  return s;
-}
-
-static inline int
-clib_bihash_key_compare_40_8 (const u64 * a, const u64 * b)
-{
-  return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2]) | (a[3] ^ b[3]) |
-	  (a[4] ^ b[4])) == 0;
-}
-
-#undef __included_bihash_template_h__
-#include <vppinfra/bihash_template.h>
-
-#endif /* __included_bihash_40_8_h__ */
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/plugins/acl/fa_node.c b/src/plugins/acl/fa_node.c
index 8d8f1d2eee4..a4ba967d7dd 100644
--- a/src/plugins/acl/fa_node.c
+++ b/src/plugins/acl/fa_node.c
@@ -20,7 +20,7 @@
 #include <vnet/pg/pg.h>
 #include <vppinfra/error.h>
 #include <acl/acl.h>
-#include "bihash_40_8.h"
+#include <vppinfra/bihash_40_8.h>
 
 #include <vppinfra/bihash_template.h>
 #include <vppinfra/bihash_template.c>
diff --git a/src/plugins/acl/fa_node.h b/src/plugins/acl/fa_node.h
index d5c766cd1fa..fa9a2303f41 100644
--- a/src/plugins/acl/fa_node.h
+++ b/src/plugins/acl/fa_node.h
@@ -2,7 +2,7 @@
 #define _FA_NODE_H_
 
 #include <stddef.h>
-#include "bihash_40_8.h"
+#include <vppinfra/bihash_40_8.h>
 
 #define TCP_FLAG_FIN    0x01
 #define TCP_FLAG_SYN    0x02