diff options
author | Gao feng <gaofeng@cn.fujitsu.com> | 2013-01-21 17:10:32 -0500 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-01-23 06:56:33 -0500 |
commit | 04d870017908f40bbb1c51910acc030ae4979db4 (patch) | |
tree | 552a8d3d957bbfb6626270f1304a3d10acefdf61 /include | |
parent | 5f69b8f5218dc303cbcb6f71d221c27d3cd17ebb (diff) |
netfilter: nf_ct_proto: move initialization out of pernet_operations
Move the global initial codes to the module_init/exit context.
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/netfilter/nf_conntrack_core.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h index e05c1f67055c..930275fa2ea6 100644 --- a/include/net/netfilter/nf_conntrack_core.h +++ b/include/net/netfilter/nf_conntrack_core.h | |||
@@ -28,8 +28,11 @@ extern unsigned int nf_conntrack_in(struct net *net, | |||
28 | extern int nf_conntrack_init_net(struct net *net); | 28 | extern int nf_conntrack_init_net(struct net *net); |
29 | extern void nf_conntrack_cleanup_net(struct net *net); | 29 | extern void nf_conntrack_cleanup_net(struct net *net); |
30 | 30 | ||
31 | extern int nf_conntrack_proto_init(struct net *net); | 31 | extern int nf_conntrack_proto_pernet_init(struct net *net); |
32 | extern void nf_conntrack_proto_fini(struct net *net); | 32 | extern void nf_conntrack_proto_pernet_fini(struct net *net); |
33 | |||
34 | extern int nf_conntrack_proto_init(void); | ||
35 | extern void nf_conntrack_proto_fini(void); | ||
33 | 36 | ||
34 | extern int nf_conntrack_init_start(void); | 37 | extern int nf_conntrack_init_start(void); |
35 | extern void nf_conntrack_cleanup_start(void); | 38 | extern void nf_conntrack_cleanup_start(void); |