diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-20 11:34:00 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-20 11:34:00 +0100 |
| commit | e0d7b66f0a3eb9528eebb59b83ce14e8f2025b1d (patch) | |
| tree | ee5823bbd3fcc46526e547ad40927022e6dd228a /kernel/ip_set_bitmap_ip.c | |
| parent | cbeaceead3416d4522ef1e97977469e0633f1eea (diff) | |
NETMASK*, HOSTMASK* macros are too generic
NETMASK*, HOSTMASK* macros are rewritten to small inline functions
ip_set_netmask* and ip_set_hostmask* (Patrick McHardy's review)
Diffstat (limited to 'kernel/ip_set_bitmap_ip.c')
| -rw-r--r-- | kernel/ip_set_bitmap_ip.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kernel/ip_set_bitmap_ip.c b/kernel/ip_set_bitmap_ip.c index a1fed99..fba4f7b 100644 --- a/kernel/ip_set_bitmap_ip.c +++ b/kernel/ip_set_bitmap_ip.c @@ -46,9 +46,9 @@ struct bitmap_ip { }; static inline u32 -ip_to_id(const struct bitmap_ip *map, u32 ip) +ip_to_id(const struct bitmap_ip *m, u32 ip) { - return ((ip & HOSTMASK(map->netmask)) - map->first_ip)/map->hosts; + return ((ip & ip_set_hostmask(m->netmask)) - m->first_ip)/m->hosts; } static inline int @@ -155,8 +155,8 @@ bitmap_ip_uadt(struct ip_set *set, struct nlattr *head, int len, if (cidr > 32) return -IPSET_ERR_INVALID_CIDR; - ip &= HOSTMASK(cidr); - ip_to = ip | ~HOSTMASK(cidr); + ip &= ip_set_hostmask(cidr); + ip_to = ip | ~ip_set_hostmask(cidr); } else ip_to = ip; @@ -391,8 +391,8 @@ bitmap_ip_timeout_uadt(struct ip_set *set, struct nlattr *head, int len, if (cidr > 32) return -IPSET_ERR_INVALID_CIDR; - ip &= HOSTMASK(cidr); - ip_to = ip | ~HOSTMASK(cidr); + ip &= ip_set_hostmask(cidr); + ip_to = ip | ~ip_set_hostmask(cidr); } else ip_to = ip; @@ -623,7 +623,7 @@ bitmap_ip_create(struct ip_set *set, struct nlattr *head, int len, if (cidr >= 32) return -IPSET_ERR_INVALID_CIDR; - last_ip = first_ip | ~HOSTMASK(cidr); + last_ip = first_ip | ~ip_set_hostmask(cidr); } else return -IPSET_ERR_PROTOCOL; @@ -633,8 +633,8 @@ bitmap_ip_create(struct ip_set *set, struct nlattr *head, int len, if (netmask > 32) return -IPSET_ERR_INVALID_NETMASK; - first_ip &= HOSTMASK(netmask); - last_ip |= ~HOSTMASK(netmask); + first_ip &= ip_set_hostmask(netmask); + last_ip |= ~ip_set_hostmask(netmask); } if (netmask == 32) { |