From: Sergey Popovich <popovich_sergei@mail.ua>
Date: Sat, 2 May 2015 17:28:18 +0000 (+0200)
Subject: netfilter: ipset: Fix hashing for ipv6 sets
X-Git-Tag: omap-for-v4.3/legacy-v2-signed~163^2~263^2~8
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58cc06daeacc8158f7471f3331965ec34aa5a172;p=pandora-kernel.git

netfilter: ipset: Fix hashing for ipv6 sets

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>
---

Reading git-diff-tree failed