lib: move prefix hash key to prefix.c to allow global use

Signed-off-by: Christian Franke <chris@opensourcerouting.org>

1 files changed, 1 insertions, 14 deletions

diff --git a/lib/table.c b/lib/table.c
index 2defa4fb62..e89d7d1c67 100644
--- a/lib/table.c
+++ b/lib/table.c
@@ -27,7 +27,6 @@
 #include "table.h"
 #include "memory.h"
 #include "sockunion.h"
-#include "jhash.h"
 
 DEFINE_MTYPE(LIB, ROUTE_TABLE, "Route table")
 DEFINE_MTYPE(LIB, ROUTE_NODE, "Route node")
@@ -35,18 +34,6 @@ DEFINE_MTYPE(LIB, ROUTE_NODE, "Route node")
 static void route_node_delete(struct route_node *);
 static void route_table_free(struct route_table *);
 
-static unsigned route_table_hash_key(void *pp)
-{
-	struct prefix copy;
-
-	/* make sure *all* unused bits are zero, particularly including
-	 * alignment /
-	 * padding and unused prefix bytes. */
-	memset(&copy, 0, sizeof(copy));
-	prefix_copy(&copy, (struct prefix *)pp);
-	return jhash(&copy, sizeof(copy), 0x55aa5a5a);
-}
-
 static int route_table_hash_cmp(const void *a, const void *b)
 {
 	const struct prefix *pa = a, *pb = b;
@@ -63,7 +50,7 @@ route_table_init_with_delegate(route_table_delegate_t *delegate)
 
 	rt = XCALLOC(MTYPE_ROUTE_TABLE, sizeof(struct route_table));
 	rt->delegate = delegate;
-	rt->hash = hash_create(route_table_hash_key, route_table_hash_cmp,
+	rt->hash = hash_create(prefix_hash_key, route_table_hash_cmp,
 			       "route table hash");
 	return rt;
 }