diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-13 21:48:17 +0100 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-13 21:48:17 +0100 |
commit | 9c4b9a1ca942ae933fe4693a25e2ddea873cc341 (patch) | |
tree | df0c0530150adf9469730dbcb6e34e41b6a419f7 /kernel/include/linux | |
parent | 4d5fdf0b5086aa6d5b38240c39e00d9ac3c34976 (diff) |
Separate prefixlens from ip_set core.
Separate prefixlens from ip_set core for better readibility and honoring
the independence.
Also, comment that prefixlens were borrowed from Jan Engelhardt.
Diffstat (limited to 'kernel/include/linux')
-rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set.h | 9 | ||||
-rw-r--r-- | kernel/include/linux/netfilter/ipset/pfxlen.h | 16 |
2 files changed, 16 insertions, 9 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h index 72ff624..6644a4c 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set.h +++ b/kernel/include/linux/netfilter/ipset/ip_set.h @@ -491,15 +491,6 @@ bitmap_bytes(u32 a, u32 b) return 4 * ((((b - a + 8) / 8) + 3) / 4); } -/* Prefixlen maps */ -extern const union nf_inet_addr prefixlen_netmask_map[]; -extern const union nf_inet_addr prefixlen_hostmask_map[]; - -#define NETMASK(n) prefixlen_netmask_map[n].ip -#define NETMASK6(n) prefixlen_netmask_map[n].ip6 -#define HOSTMASK(n) prefixlen_hostmask_map[n].ip -#define HOSTMASK6(n) prefixlen_hostmask_map[n].ip6 - /* Interface to iptables/ip6tables */ #define SO_IP_SET 83 diff --git a/kernel/include/linux/netfilter/ipset/pfxlen.h b/kernel/include/linux/netfilter/ipset/pfxlen.h new file mode 100644 index 0000000..fe7153c --- /dev/null +++ b/kernel/include/linux/netfilter/ipset/pfxlen.h @@ -0,0 +1,16 @@ +#ifndef _PFXLEN_H +#define _PFXLEN_H + +#include <asm/byteorder.h> +#include <linux/netfilter.h> + +/* Prefixlen maps, by Jan Engelhardt */ +extern const union nf_inet_addr prefixlen_netmask_map[]; +extern const union nf_inet_addr prefixlen_hostmask_map[]; + +#define NETMASK(n) prefixlen_netmask_map[n].ip +#define NETMASK6(n) prefixlen_netmask_map[n].ip6 +#define HOSTMASK(n) prefixlen_hostmask_map[n].ip +#define HOSTMASK6(n) prefixlen_hostmask_map[n].ip6 + +#endif /*_PFXLEN_H */ |