From 2fe017368966a21980bd36e5647c0f59c9290b7d Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 21 Jul 2011 12:05:31 +0200 Subject: [PATCH] --- yaml --- r: 256543 b: refs/heads/master c: a6a7b759ba62e62542308e091f7fc9cfac4f978e h: refs/heads/master i: 256541: 99c0b5186126445063db4b7657834f972a67e27d 256539: 2437ab29bc562f6b487dddf74d0d13a2f130fff5 256535: e4a9f4d24e8fc90e400b23b83e8cdade0ab565c5 256527: b7799deef40a5d20ead88f468c5b38070c9bb98a 256511: 910d986cd669dbb16f8cac65c92b26003dbc75c7 v: v3 --- [refs] | 2 +- trunk/include/linux/netfilter/ipset/ip_set_ahash.h | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 24b046373f5f..56139a39cbad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97d32cf9440d2111a12471740446d4d63231b79a +refs/heads/master: a6a7b759ba62e62542308e091f7fc9cfac4f978e diff --git a/trunk/include/linux/netfilter/ipset/ip_set_ahash.h b/trunk/include/linux/netfilter/ipset/ip_set_ahash.h index c5b06aaa205c..42b7d25a1b2e 100644 --- a/trunk/include/linux/netfilter/ipset/ip_set_ahash.h +++ b/trunk/include/linux/netfilter/ipset/ip_set_ahash.h @@ -211,12 +211,16 @@ ip_set_hash_destroy(struct ip_set *set) set->data = NULL; } -#define HKEY(data, initval, htable_bits) \ -(jhash2((u32 *)(data), sizeof(struct type_pf_elem)/sizeof(u32), initval) \ - & jhash_mask(htable_bits)) - #endif /* _IP_SET_AHASH_H */ +#ifndef HKEY_DATALEN +#define HKEY_DATALEN sizeof(struct type_pf_elem) +#endif + +#define HKEY(data, initval, htable_bits) \ +(jhash2((u32 *)(data), HKEY_DATALEN/sizeof(u32), initval) \ + & jhash_mask(htable_bits)) + #define CONCAT(a, b, c) a##b##c #define TOKEN(a, b, c) CONCAT(a, b, c) @@ -1054,6 +1058,8 @@ type_pf_gc_init(struct ip_set *set) IPSET_GC_PERIOD(h->timeout)); } +#undef HKEY_DATALEN +#undef HKEY #undef type_pf_data_equal #undef type_pf_data_isnull #undef type_pf_data_copy