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_netport.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_netport.c')
| -rw-r--r-- | kernel/ip_set_hash_netport.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/ip_set_hash_netport.c b/kernel/ip_set_hash_netport.c index ef06aff..93cc0e8 100644 --- a/kernel/ip_set_hash_netport.c +++ b/kernel/ip_set_hash_netport.c @@ -99,7 +99,7 @@ hash_netport4_data_swap(struct hash_netport4_elem *dst, static inline void hash_netport4_data_netmask(struct hash_netport4_elem *elem, u8 cidr) { - elem->ip &= NETMASK(cidr); + elem->ip &= ip_set_netmask(cidr); elem->cidr = cidr; } @@ -169,7 +169,7 @@ hash_netport4_kadt(struct ip_set *set, const struct sk_buff *skb, return -EINVAL; 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); } @@ -212,7 +212,7 @@ hash_netport4_uadt(struct ip_set *set, struct nlattr *head, int len, data.cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]); if (!data.cidr) return -IPSET_ERR_INVALID_CIDR; - data.ip &= NETMASK(data.cidr); + data.ip &= ip_set_netmask(data.cidr); if (tb[IPSET_ATTR_PORT]) data.port = ip_set_get_n16(tb[IPSET_ATTR_PORT]); @@ -338,10 +338,10 @@ hash_netport6_data_zero_out(struct hash_netport6_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 |