From c896b069e6c9cd229119a791c51d19e8f11c853c Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Wed, 11 Nov 2009 20:29:31 +0100 Subject: 4.1 version released --- kernel/ip_set_ipportnethash.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kernel/ip_set_ipportnethash.c') diff --git a/kernel/ip_set_ipportnethash.c b/kernel/ip_set_ipportnethash.c index 9179184..f328972 100644 --- a/kernel/ip_set_ipportnethash.c +++ b/kernel/ip_set_ipportnethash.c @@ -284,7 +284,8 @@ __ipportnethash_list_header(const struct ip_set_ipportnethash *map, HASH_LIST_HEADER(ipportnethash) HASH_LIST_MEMBERS_SIZE(ipportnethash, struct ipportip) -HASH_LIST_MEMBERS_MEMCPY(ipportnethash, struct ipportip) +HASH_LIST_MEMBERS_MEMCPY(ipportnethash, struct ipportip, + (elem->ip || elem->ip1)) IP_SET_RTYPE(ipportnethash, IPSET_TYPE_IP | IPSET_TYPE_PORT | IPSET_TYPE_IP1 | IPSET_DATA_TRIPLE) -- cgit v1.2.3