diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-09-30 09:05:54 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-09-30 21:33:26 +0200 |
| commit | a04d8b6bd9113f3e7f0c216dcaa3c1ad498f2a96 (patch) | |
| tree | 01f06ec37d529b0ef82a12ec3c154e26da43a600 /include/linux | |
| parent | 5e04c0c38c90f1f11a0e87800e4c22d4aba1d733 (diff) | |
| download | linux-stable-a04d8b6bd9113f3e7f0c216dcaa3c1ad498f2a96.tar.gz linux-stable-a04d8b6bd9113f3e7f0c216dcaa3c1ad498f2a96.tar.bz2 linux-stable-a04d8b6bd9113f3e7f0c216dcaa3c1ad498f2a96.zip | |
netfilter: ipset: 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.
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter/ipset/ip_set.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h index 69aa60487f05..56012a3431b2 100644 --- a/include/linux/netfilter/ipset/ip_set.h +++ b/include/linux/netfilter/ipset/ip_set.h @@ -398,6 +398,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) |