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_hash_net.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_hash_net.c')
| -rw-r--r-- | kernel/ip_set_hash_net.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/ip_set_hash_net.c b/kernel/ip_set_hash_net.c index f2d91a9..693eaf3 100644 --- a/kernel/ip_set_hash_net.c +++ b/kernel/ip_set_hash_net.c @@ -91,7 +91,7 @@ hash_net4_data_swap(struct hash_net4_elem *dst, static inline void hash_net4_data_netmask(struct hash_net4_elem *elem, u8 cidr) { - elem->ip &= NETMASK(cidr); + elem->ip &= ip_set_netmask(cidr); elem->cidr = cidr; } @@ -150,7 +150,7 @@ hash_net4_kadt(struct ip_set *set, const struct sk_buff *skb, data.cidr = HOST_MASK; ip4addrptr(skb, flags & IPSET_DIM_ONE_SRC, &data.ip); - data.ip &= NETMASK(data.cidr); + data.ip &= ip_set_netmask(data.cidr); return adtfn(set, &data, h->timeout); } @@ -189,7 +189,7 @@ hash_net4_uadt(struct ip_set *set, struct nlattr *head, int len, if (!data.cidr) return -IPSET_ERR_INVALID_CIDR; - data.ip &= NETMASK(data.cidr); + data.ip &= ip_set_netmask(data.cidr); if (tb[IPSET_ATTR_TIMEOUT]) { if (!with_timeout(h->timeout)) @@ -271,10 +271,10 @@ hash_net6_data_zero_out(struct hash_net6_elem *elem) static inline void ip6_netmask(union nf_inet_addr *ip, u8 prefix) { - ip->ip6[0] &= NETMASK6(prefix)[0]; - ip->ip6[1] &= NETMASK6(prefix)[1]; - ip->ip6[2] &= NETMASK6(prefix)[2]; - ip->ip6[3] &= NETMASK6(prefix)[3]; + ip->ip6[0] &= ip_set_netmask6(prefix)[0]; + ip->ip6[1] &= ip_set_netmask6(prefix)[1]; + ip->ip6[2] &= ip_set_netmask6(prefix)[2]; + ip->ip6[3] &= ip_set_netmask6(prefix)[3]; } static inline void |