summaryrefslogtreecommitdiffstats
path: root/kernel/ip_set_ipportiphash.c
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2009-11-11 20:29:31 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2009-11-11 20:29:31 +0100
commitc896b069e6c9cd229119a791c51d19e8f11c853c (patch)
treefbdd1c62f0153acd75afa392d47aa8888b975dc0 /kernel/ip_set_ipportiphash.c
parenta8231be7ebf6086d21a25ea6d4a46a5117697189 (diff)
4.1 version releasedv4.1
Diffstat (limited to 'kernel/ip_set_ipportiphash.c')
-rw-r--r--kernel/ip_set_ipportiphash.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/ip_set_ipportiphash.c b/kernel/ip_set_ipportiphash.c
index 5fe00f1..8b8f2a2 100644
--- a/kernel/ip_set_ipportiphash.c
+++ b/kernel/ip_set_ipportiphash.c
@@ -200,7 +200,8 @@ __ipportiphash_list_header(const struct ip_set_ipportiphash *map,
HASH_LIST_HEADER(ipportiphash)
HASH_LIST_MEMBERS_SIZE(ipportiphash, struct ipportip)
-HASH_LIST_MEMBERS_MEMCPY(ipportiphash, struct ipportip)
+HASH_LIST_MEMBERS_MEMCPY(ipportiphash, struct ipportip,
+ (elem->ip || elem->ip1))
IP_SET_RTYPE(ipportiphash, IPSET_TYPE_IP | IPSET_TYPE_PORT
| IPSET_TYPE_IP1 | IPSET_DATA_TRIPLE)