aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/netfilter
diff options
context:
space:
mode:
authorGao feng <gaofeng@cn.fujitsu.com>2013-01-21 22:10:26 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2013-01-23 12:55:29 +0100
commitb7ff3a1fae78783e0ab1ef82f5978aeb89ddd16b (patch)
treef8367cc6601a911b8a88de7db697c33c9df48e89 /include/net/netfilter
parentnetfilter: nf_ct_expect: move initialization out of pernet_operations (diff)
downloadlinux-dev-b7ff3a1fae78783e0ab1ef82f5978aeb89ddd16b.tar.xz
linux-dev-b7ff3a1fae78783e0ab1ef82f5978aeb89ddd16b.zip
netfilter: nf_ct_acct: 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/net/netfilter')
-rw-r--r--include/net/netfilter/nf_conntrack_acct.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_conntrack_acct.h b/include/net/netfilter/nf_conntrack_acct.h
index 463ae8e16696..2bdb7a15fe06 100644
--- a/include/net/netfilter/nf_conntrack_acct.h
+++ b/include/net/netfilter/nf_conntrack_acct.h
@@ -57,7 +57,9 @@ static inline void nf_ct_set_acct(struct net *net, bool enable)
net->ct.sysctl_acct = enable;
}
-extern int nf_conntrack_acct_init(struct net *net);
-extern void nf_conntrack_acct_fini(struct net *net);
+extern int nf_conntrack_acct_pernet_init(struct net *net);
+extern void nf_conntrack_acct_pernet_fini(struct net *net);
+extern int nf_conntrack_acct_init(void);
+extern void nf_conntrack_acct_fini(void);
#endif /* _NF_CONNTRACK_ACCT_H */