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_netport.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'kernel/net/netfilter/ipset/ip_set_hash_netport.c') diff --git a/kernel/net/netfilter/ipset/ip_set_hash_netport.c b/kernel/net/netfilter/ipset/ip_set_hash_netport.c index 3001030..90adc2c 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_netport.c +++ b/kernel/net/netfilter/ipset/ip_set_hash_netport.c @@ -245,8 +245,7 @@ hash_netport4_uadt(struct ip_set *set, struct nlattr *tb[], if (ip + UINT_MAX == ip_to) return -IPSET_ERR_HASH_RANGE; } else { - ip &= ip_set_hostmask(data.cidr); - ip_to = ip | ~ip_set_hostmask(data.cidr); + ip_set_mask_from_to(ip, ip_to, data.cidr); } if (retried) -- cgit v1.2.3