Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md

[firefly-linux-kernel-4.4.55.git] / include / net / netfilter / nf_conntrack_l3proto.h

diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 9699c028b74b5731432726142687df4bd51aa450..6f7c13f4ac0329366ed32b9c5a27dc13253daff5 100644 (file)
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -64,11 +64,12 @@ struct nf_conntrack_l3proto {
        size_t nla_size;
 
 #ifdef CONFIG_SYSCTL
-       struct ctl_table_header *ctl_table_header;
        const char              *ctl_table_path;
-       struct ctl_table        *ctl_table;
 #endif /* CONFIG_SYSCTL */
 
+       /* Init l3proto pernet data */
+       int (*init_net)(struct net *net);
+
        /* Module (if any) which this is connected to. */
        struct module *me;
 };
@@ -76,8 +77,10 @@ struct nf_conntrack_l3proto {
 extern struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[AF_MAX];
 
 /* Protocol registration. */
-extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto);
-extern void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto);
+extern int nf_conntrack_l3proto_register(struct net *net,
+                                        struct nf_conntrack_l3proto *proto);
+extern void nf_conntrack_l3proto_unregister(struct net *net,
+                                           struct nf_conntrack_l3proto *proto);
 extern struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto);
 extern void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p);