Merge branch 'upstream'

[linux-2.6-omap-h63xx.git] / include / linux / netfilter_ipv6 / ip6_tables.h

diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index 59f70b34e02925568c18c9c3f2dd0a6b7c294156..2efc046d9e94b181765e55f9fae48674bb1e351c 100644 (file)
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -57,7 +57,8 @@ struct ip6t_entry_match
                        u_int16_t match_size;
 
                        /* Used by userspace */
-                       char name[IP6T_FUNCTION_MAXNAMELEN];
+                       char name[IP6T_FUNCTION_MAXNAMELEN-1];
+                       u_int8_t revision;
                } user;
                struct {
                        u_int16_t match_size;
@@ -80,7 +81,8 @@ struct ip6t_entry_target
                        u_int16_t target_size;
 
                        /* Used by userspace */
-                       char name[IP6T_FUNCTION_MAXNAMELEN];
+                       char name[IP6T_FUNCTION_MAXNAMELEN-1];
+                       u_int8_t revision;
                } user;
                struct {
                        u_int16_t target_size;
@@ -161,7 +163,9 @@ struct ip6t_entry
 
 #define IP6T_SO_GET_INFO               (IP6T_BASE_CTL)
 #define IP6T_SO_GET_ENTRIES            (IP6T_BASE_CTL + 1)
-#define IP6T_SO_GET_MAX                        IP6T_SO_GET_ENTRIES
+#define        IP6T_SO_GET_REVISION_MATCH      (IP6T_BASE_CTL + 2)
+#define        IP6T_SO_GET_REVISION_TARGET     (IP6T_BASE_CTL + 3)
+#define IP6T_SO_GET_MAX                        IP6T_SO_GET_REVISION_TARGET
 
 /* CONTINUE verdict for targets */
 #define IP6T_CONTINUE 0xFFFFFFFF
@@ -291,6 +295,15 @@ struct ip6t_get_entries
        struct ip6t_entry entrytable[0];
 };
 
+/* The argument to IP6T_SO_GET_REVISION_*.  Returns highest revision
+ * kernel supports, if >= revision. */
+struct ip6t_get_revision
+{
+       char name[IP6T_FUNCTION_MAXNAMELEN-1];
+
+       u_int8_t revision;
+};
+
 /* Standard return verdict, or do jump. */
 #define IP6T_STANDARD_TARGET ""
 /* Error verdict. */
@@ -352,7 +365,9 @@ struct ip6t_match
 {
        struct list_head list;
 
-       const char name[IP6T_FUNCTION_MAXNAMELEN];
+       const char name[IP6T_FUNCTION_MAXNAMELEN-1];
+
+       u_int8_t revision;
 
        /* Return true or false: return FALSE and set *hotdrop = 1 to
            force immediate packet drop. */
@@ -387,7 +402,9 @@ struct ip6t_target
 {
        struct list_head list;
 
-       const char name[IP6T_FUNCTION_MAXNAMELEN];
+       const char name[IP6T_FUNCTION_MAXNAMELEN-1];
+
+       u_int8_t revision;
 
        /* Returns verdict. Argument order changed since 2.6.9, as this
           must now handle non-linear skbs, using skb_copy_bits and