diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-06-16 20:55:58 +0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-06-16 20:55:58 +0400 |
| commit | e6146e8684ed6dd4c0ff85ca21bf4324114fbbfa (patch) | |
| tree | 31ca70199cdfeb5705a119a510414704c64f0f3e /net/netfilter/ipset/ip_set_hash_netport.c | |
| parent | f3dfd1538f26f1ecf86daaf3d0c321d87e5de041 (diff) | |
| download | linux-e6146e8684ed6dd4c0ff85ca21bf4324114fbbfa.tar.xz | |
netfilter: ipset: use unified from/to address masking and check the usage
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter/ipset/ip_set_hash_netport.c')
| -rw-r--r-- | net/netfilter/ipset/ip_set_hash_netport.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/ipset/ip_set_hash_netport.c b/net/netfilter/ipset/ip_set_hash_netport.c index 300103096879..90adc2c30665 100644 --- a/net/netfilter/ipset/ip_set_hash_netport.c +++ b/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) |