diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2016-10-10 22:07:41 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2016-11-10 13:28:45 +0100 |
| commit | 702b71e7c666a1c9be9d49e8cd173f0d4d1e859f (patch) | |
| tree | 4a4d1fc6c8792a564c0cb5aa2a7ffd8a375abdb2 /include/linux/netfilter | |
| parent | a54dad51a83ba08e951191ce3e1e9eb44750c0bb (diff) | |
| download | linux-stable-702b71e7c666a1c9be9d49e8cd173f0d4d1e859f.tar.gz linux-stable-702b71e7c666a1c9be9d49e8cd173f0d4d1e859f.tar.bz2 linux-stable-702b71e7c666a1c9be9d49e8cd173f0d4d1e859f.zip | |
netfilter: ipset: Add element count to all set types header
It is better to list the set elements for all set types, thus the
header information is uniform. Element counts are therefore added
to the bitmap and list types.
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'include/linux/netfilter')
| -rw-r--r-- | include/linux/netfilter/ipset/ip_set.h | 2 | ||||
| -rw-r--r-- | include/linux/netfilter/ipset/ip_set_bitmap.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h index 7a218eb74887..4671d740610f 100644 --- a/include/linux/netfilter/ipset/ip_set.h +++ b/include/linux/netfilter/ipset/ip_set.h @@ -250,6 +250,8 @@ struct ip_set { u8 flags; /* Default timeout value, if enabled */ u32 timeout; + /* Number of elements (vs timeout) */ + u32 elements; /* Element data size */ size_t dsize; /* Offsets to extensions in elements */ diff --git a/include/linux/netfilter/ipset/ip_set_bitmap.h b/include/linux/netfilter/ipset/ip_set_bitmap.h index 5e4662a71e01..366d6c0ea04f 100644 --- a/include/linux/netfilter/ipset/ip_set_bitmap.h +++ b/include/linux/netfilter/ipset/ip_set_bitmap.h @@ -6,8 +6,8 @@ #define IPSET_BITMAP_MAX_RANGE 0x0000FFFF enum { + IPSET_ADD_STORE_PLAIN_TIMEOUT = -1, IPSET_ADD_FAILED = 1, - IPSET_ADD_STORE_PLAIN_TIMEOUT, IPSET_ADD_START_STORED_TIMEOUT, }; |