netfilter: x_tables: change elements in x_tables

[pandora-kernel.git] / include / linux / netfilter / x_tables.h

diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index e52ce47..9fac88f 100644 (file)
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -270,6 +270,7 @@ struct xt_match
        struct list_head list;
 
        const char name[XT_FUNCTION_MAXNAMELEN-1];
+       u_int8_t revision;
 
        /* Return true or false: return FALSE and set *hotdrop = 1 to
            force immediate packet drop. */
@@ -302,7 +303,6 @@ struct xt_match
        unsigned short proto;
 
        unsigned short family;
-       u_int8_t revision;
 };
 
 /* Registration hooks for targets. */
@@ -349,9 +349,6 @@ struct xt_table
 {
        struct list_head list;
 
-       /* A unique name... */
-       const char name[XT_TABLE_MAXNAMELEN];
-
        /* What hooks you will enter on */
        unsigned int valid_hooks;
 
@@ -359,13 +356,15 @@ struct xt_table
        rwlock_t lock;
 
        /* Man behind the curtain... */
-       //struct ip6t_table_info *private;
-       void *private;
+       struct xt_table_info *private;
 
        /* Set this to THIS_MODULE if you are a module, otherwise NULL */
        struct module *me;
 
        u_int8_t af;            /* address/protocol family */
+
+       /* A unique name... */
+       const char name[XT_TABLE_MAXNAMELEN];
 };
 
 #include <linux/netfilter_ipv4.h>