From 9a84755e05850a1faab80b5c4b5e5449f9c3c88d Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Mon, 23 May 2011 10:56:14 +0200 Subject: Use unified from/to address masking and check the usage --- kernel/net/netfilter/ipset/ip_set_hash_ip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'kernel/net/netfilter/ipset/ip_set_hash_ip.c') diff --git a/kernel/net/netfilter/ipset/ip_set_hash_ip.c b/kernel/net/netfilter/ipset/ip_set_hash_ip.c index c3bc06d..bdb432e 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_ip.c +++ b/kernel/net/netfilter/ipset/ip_set_hash_ip.c @@ -177,8 +177,7 @@ hash_ip4_uadt(struct ip_set *set, struct nlattr *tb[], if (cidr > 32) return -IPSET_ERR_INVALID_CIDR; - ip &= ip_set_hostmask(cidr); - ip_to = ip | ~ip_set_hostmask(cidr); + ip_set_mask_from_to(ip, ip_to, cidr); } else ip_to = ip; -- cgit v1.2.3