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/pfxlen.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/pfxlen.c')
| -rw-r--r-- | kernel/pfxlen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/pfxlen.c b/kernel/pfxlen.c index 5f16b6d..c6c9dcc 100644 --- a/kernel/pfxlen.c +++ b/kernel/pfxlen.c @@ -14,7 +14,7 @@ * This table works for both IPv4 and IPv6; * just use prefixlen_netmask_map[prefixlength].ip. */ -const union nf_inet_addr prefixlen_netmask_map[] = { +const union nf_inet_addr ip_set_netmask_map[] = { E(0x00000000, 0x00000000, 0x00000000, 0x00000000), E(0x80000000, 0x00000000, 0x00000000, 0x00000000), E(0xC0000000, 0x00000000, 0x00000000, 0x00000000), @@ -145,7 +145,7 @@ const union nf_inet_addr prefixlen_netmask_map[] = { E(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE), E(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF), }; -EXPORT_SYMBOL_GPL(prefixlen_netmask_map); +EXPORT_SYMBOL_GPL(ip_set_netmask_map); #undef E #define E(a, b, c, d) \ @@ -155,7 +155,7 @@ EXPORT_SYMBOL_GPL(prefixlen_netmask_map); * This table works for both IPv4 and IPv6; * just use prefixlen_hostmask_map[prefixlength].ip. */ -const union nf_inet_addr prefixlen_hostmask_map[] = { +const union nf_inet_addr ip_set_hostmask_map[] = { E(0x00000000, 0x00000000, 0x00000000, 0x00000000), E(0x80000000, 0x00000000, 0x00000000, 0x00000000), E(0xC0000000, 0x00000000, 0x00000000, 0x00000000), @@ -286,4 +286,4 @@ const union nf_inet_addr prefixlen_hostmask_map[] = { E(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE), E(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF), }; -EXPORT_SYMBOL_GPL(prefixlen_hostmask_map); +EXPORT_SYMBOL_GPL(ip_set_hostmask_map); |