diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2014-02-13 06:19:56 -0500 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2014-03-06 03:31:42 -0500 |
commit | af284ece87365f3a69723f5bcc1bcdb505b5eb5d (patch) | |
tree | 9b320a4d6242ad9e1e946e84849419443aa11dc9 | |
parent | 4d0e5c076d01d3fb4767a502a9517923fb9a080e (diff) |
netfilter: ipset: Prepare the kernel for create option flags when no extension is needed
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
-rw-r--r-- | include/linux/netfilter/ipset/ip_set.h | 2 | ||||
-rw-r--r-- | include/uapi/linux/netfilter/ipset/ip_set.h | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h index 4ac00d4aa87e..f476bcec25ea 100644 --- a/include/linux/netfilter/ipset/ip_set.h +++ b/include/linux/netfilter/ipset/ip_set.h | |||
@@ -219,6 +219,8 @@ struct ip_set { | |||
219 | u8 revision; | 219 | u8 revision; |
220 | /* Extensions */ | 220 | /* Extensions */ |
221 | u8 extensions; | 221 | u8 extensions; |
222 | /* Create flags */ | ||
223 | u8 flags; | ||
222 | /* Default timeout value, if enabled */ | 224 | /* Default timeout value, if enabled */ |
223 | u32 timeout; | 225 | u32 timeout; |
224 | /* Element data size */ | 226 | /* Element data size */ |
diff --git a/include/uapi/linux/netfilter/ipset/ip_set.h b/include/uapi/linux/netfilter/ipset/ip_set.h index f636f282b142..a29a378701d2 100644 --- a/include/uapi/linux/netfilter/ipset/ip_set.h +++ b/include/uapi/linux/netfilter/ipset/ip_set.h | |||
@@ -188,6 +188,12 @@ enum ipset_cadt_flags { | |||
188 | IPSET_FLAG_CADT_MAX = 15, | 188 | IPSET_FLAG_CADT_MAX = 15, |
189 | }; | 189 | }; |
190 | 190 | ||
191 | /* The flag bits which correspond to the non-extension create flags */ | ||
192 | enum ipset_create_flags { | ||
193 | IPSET_CREATE_FLAG_NONE = 0, | ||
194 | IPSET_CREATE_FLAG_MAX = 7, | ||
195 | }; | ||
196 | |||
191 | /* Commands with settype-specific attributes */ | 197 | /* Commands with settype-specific attributes */ |
192 | enum ipset_adt { | 198 | enum ipset_adt { |
193 | IPSET_ADD, | 199 | IPSET_ADD, |