Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6-omap-h63xx.git] / include / net / netfilter / nf_conntrack_l4proto.h

diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 0c6babd54396065a8f6ac12f56334d975ea188c7..f46cb930414cc8a1cdd27c5d688a688a154fc301 100644 (file)
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -16,9 +16,6 @@ struct nfattr;
 
 struct nf_conntrack_l4proto
 {
-       /* Next pointer. */
-       struct list_head list;
-
        /* L3 Protocol number. */
        u_int16_t l3proto;
 
@@ -79,6 +76,16 @@ struct nf_conntrack_l4proto
        int (*nfattr_to_tuple)(struct nfattr *tb[],
                               struct nf_conntrack_tuple *t);
 
+#ifdef CONFIG_SYSCTL
+       struct ctl_table_header **ctl_table_header;
+       struct ctl_table        *ctl_table;
+       unsigned int            *ctl_table_users;
+#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
+       struct ctl_table_header *ctl_compat_table_header;
+       struct ctl_table        *ctl_compat_table;
+#endif
+#endif
+
        /* Module (if any) which this is connected to. */
        struct module *me;
 };
@@ -90,7 +97,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;
 
 #define MAX_NF_CT_PROTO 256
-extern struct nf_conntrack_l4proto **nf_ct_protos[PF_MAX];
 
 extern struct nf_conntrack_l4proto *
 __nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto);