[IPV4]: Use ctl paths to register net/ipv4/ table

[linux-2.6] / include / net / netfilter / nf_conntrack_helper.h

diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index 2c0e2e0fb7ff6ab7924908bdde9248c0b078974c..d7b2d5483a7128702fdd81ac914908eba8b15e23 100644 (file)
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -15,8 +15,8 @@
 struct module;
 
 struct nf_conntrack_helper
-{      
-       struct list_head list;          /* Internal use. */
+{
+       struct hlist_node hnode;        /* Internal use. */
 
        const char *name;               /* name of the module */
        struct module *me;              /* pointer to self */
@@ -29,14 +29,14 @@ struct nf_conntrack_helper
 
        /* Function to call when data passes; return verdict, or -1 to
            invalidate. */
-       int (*help)(struct sk_buff **pskb,
+       int (*help)(struct sk_buff *skb,
                    unsigned int protoff,
                    struct nf_conn *ct,
                    enum ip_conntrack_info conntrackinfo);
 
        void (*destroy)(struct nf_conn *ct);
 
-       int (*to_nfattr)(struct sk_buff *skb, const struct nf_conn *ct);
+       int (*to_nlattr)(struct sk_buff *skb, const struct nf_conn *ct);
 };
 
 extern struct nf_conntrack_helper *