|
|
- From 831486ea6c7d7adfbdc453587a65bcba247d698b Mon Sep 17 00:00:00 2001
- From: Alberto Leiva Popper <ydahhrk@gmail.com>
- Date: Fri, 6 Jul 2018 13:19:21 -0500
- Subject: [PATCH 1/2] Add support for kernel 4.17
-
- Fixes #266.
- ---
- mod/common/hash_table.c | 14 +++-----------
- mod/stateful/fragment_db.c | 4 +---
- 2 files changed, 4 insertions(+), 14 deletions(-)
-
- diff --git a/mod/common/hash_table.c b/mod/common/hash_table.c
- index 25ddd7a6..4e9272f8 100644
- --- a/mod/common/hash_table.c
- +++ b/mod/common/hash_table.c
- @@ -23,8 +23,7 @@
- * @macro HTABLE_NAME name of the hash table structure to generate. Optional; Default: hash_table.
- * @macro KEY_TYPE data type of the table's keys.
- * @macro VALUE_TYPE data type of the table's values.
- - * @macro HASH_TABLE_SIZE The size of the internal array, in slots. Optional;
- - * Default = Max = 64k - 1.
- + * @macro HASH_TABLE_SIZE The size of the internal array, in slots. MUST be a power of 2.
- * @macro GENERATE_PRINT just define it if you want the print function; otherwise it will not be
- * generated.
- * @macro GENERATE_FOR_EACH just define it if you want the for_each function; otherwise it will not
- @@ -44,13 +43,6 @@
- #define HTABLE_NAME hash_table
- #endif
-
- -#ifndef HASH_TABLE_SIZE
- -/**
- - * This number should not exceed unsigned int's maximum.
- - */
- -#define HASH_TABLE_SIZE (64 * 1024 - 1)
- -#endif
- -
- /** Creates a token name by concatenating prefix and suffix. */
- #define CONCAT_AUX(prefix, suffix) prefix ## suffix
- /** Seems useless, but if not present, the compiler won't expand the HTABLE_NAME macro... */
- @@ -131,7 +123,7 @@ static struct KEY_VALUE_PAIR *GET_AUX(struct HTABLE_NAME *table, const KEY_TYPE
- if (WARN(!table, "The table is NULL."))
- return NULL;
-
- - hash_code = table->hash_function(key) % HASH_TABLE_SIZE;
- + hash_code = table->hash_function(key) & (HASH_TABLE_SIZE - 1);
- hlist_for_each(current_node, &table->table[hash_code]) {
- current_pair = hlist_entry(current_node, struct KEY_VALUE_PAIR, hlist_hook);
- if (table->equals_function(key, ¤t_pair->key))
- @@ -210,7 +202,7 @@ static int PUT(struct HTABLE_NAME *table, KEY_TYPE *key, VALUE_TYPE *value)
- key_value->value = value;
-
- /* Insert the key-value to the table. */
- - hash_code = table->hash_function(key) % HASH_TABLE_SIZE;
- + hash_code = table->hash_function(key) & (HASH_TABLE_SIZE - 1);
- hlist_add_head(&key_value->hlist_hook, &table->table[hash_code]);
- list_add_tail(&key_value->list_hook, &table->list);
-
- diff --git a/mod/stateful/fragment_db.c b/mod/stateful/fragment_db.c
- index 44f966aa..ef0b1f5a 100644
- --- a/mod/stateful/fragment_db.c
- +++ b/mod/stateful/fragment_db.c
- @@ -90,10 +90,8 @@ static bool equals_function(const struct packet *k1, const struct packet *k2)
- static unsigned int inet6_hash_frag(__be32 id, const struct in6_addr *saddr,
- const struct in6_addr *daddr, u32 rnd)
- {
- - u32 c;
- - c = jhash_3words(ipv6_addr_hash(saddr), ipv6_addr_hash(daddr),
- + return jhash_3words(ipv6_addr_hash(saddr), ipv6_addr_hash(daddr),
- (__force u32)id, rnd);
- - return c & (INETFRAGS_HASHSZ - 1);
- }
- #endif
-
- --
- 2.19.1
-
|
