netfilter: ipset: Rename extension offset ids to extension ids

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

1 files changed, 8 insertions, 8 deletions

diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index 56012a3431b2..b4db7912bf0d 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -56,20 +56,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;