summaryrefslogtreecommitdiffstats
path: root/kernel/include
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-09-04 16:56:12 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-09-04 16:56:12 +0200
commit558350b7ad14b174898dc7665669965d1031d2e4 (patch)
treecc780a0c32339e324776f14d3c2c033679908895 /kernel/include
parente883bb17de2b69e7f3ae9b414915aebef477f383 (diff)
Prepare ipset to support multiple networks for hash types
In order to support hash:net,net, hash:net,port,net etc. types, arrays are introduced for the book-keeping of existing cidr sizes and network numbers in a set.
Diffstat (limited to 'kernel/include')
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h
index f974f35..03f99d6 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set.h
@@ -399,6 +399,8 @@ bitmap_bytes(u32 a, u32 b)
{ .bytes = ULLONG_MAX, .packets = ULLONG_MAX, \
.timeout = (map)->timeout }
+#define IP_SET_INIT_CIDR(a, b) ((a) ? (a) : (b))
+
#define IPSET_CONCAT(a, b) a##b
#define IPSET_TOKEN(a, b) IPSET_CONCAT(a, b)