summaryrefslogtreecommitdiffstats
path: root/kernel/include
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-09-06 22:31:40 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-09-06 22:31:40 +0200
commita36264dba1edfd6584022660346a6d7fe2519a2b (patch)
tree996d6fce5f08bfb97d4135f1c4e52b0064641935 /kernel/include
parent558350b7ad14b174898dc7665669965d1031d2e4 (diff)
Rename extension offset ids to extension ids
Diffstat (limited to 'kernel/include')
-rw-r--r--kernel/include/linux/netfilter/ipset/ip_set.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h
index 03f99d6..72185d4 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set.h
@@ -57,20 +57,20 @@ enum ip_set_extension {
IPSET_EXT_COUNTER = (1 << IPSET_EXT_BIT_COUNTER),
};
-/* Extension offsets */
-enum ip_set_offset {
- IPSET_OFFSET_TIMEOUT = 0,
- IPSET_OFFSET_COUNTER,
- IPSET_OFFSET_MAX,
-};
-
#define SET_WITH_TIMEOUT(s) ((s)->extensions & IPSET_EXT_TIMEOUT)
#define SET_WITH_COUNTER(s) ((s)->extensions & IPSET_EXT_COUNTER)
+/* Extension id, in size order */
+enum ip_set_ext_id {
+ IPSET_EXT_ID_COUNTER = 0,
+ IPSET_EXT_ID_TIMEOUT,
+ IPSET_EXT_ID_MAX,
+};
+
struct ip_set_ext {
- u32 timeout;
u64 packets;
u64 bytes;
+ u32 timeout;
};
struct ip_set;