netfilter: ipset: Fix hashing for ipv6 sets

Browse source

HKEY_DATALEN remains defined after first inclusion
of ip_set_hash_gen.h, so it is incorrectly reused
for IPv6 code.

Undefine HKEY_DATALEN in ip_set_hash_gen.h at the end.

Also remove some useless defines of HKEY_DATALEN in
ip_set_hash_{ip{,mark,port},netiface}.c as ip_set_hash_gen.h
defines it correctly for such set types anyway.

Signed-off-by: Sergey Popovich <popovich_sergei@mail.ua>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

...

This commit is contained in:

Sergey Popovich 2015-05-02 19:28:18 +02:00 • committed by Pablo Neira Ayuso

parent 275e2bc0f2

commit 58cc06daea

5 changed files with 2 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

net/netfilter/ipset/ip_set_hash_gen.h

View file

1

net/netfilter/ipset/ip_set_hash_ip.c

View file

3

net/netfilter/ipset/ip_set_hash_ipmark.c

View file

3

net/netfilter/ipset/ip_set_hash_ipport.c

View file

1

net/netfilter/ipset/ip_set_hash_netiface.c

View file