diff options
| author |   Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-08 11:35:09 +0200 |
|---|---|---|
| committer |   Patrick McHardy <kaber@trash.net> | 2008-10-08 11:35:09 +0200 |
| commit | d716a4dfbbdf0d4731d596a96e5f4b0d892ac168 (patch) | |
| tree | 6131d86efdcebf7da50ded77e437223df9f41f7c /net/netfilter/nf_conntrack_core.c | |
| parent | netfilter: netns nf_conntrack: per-netns net.netfilter.nf_conntrack_log_invalid sysctl (diff) | |
| download | linux-dev-d716a4dfbbdf0d4731d596a96e5f4b0d892ac168.tar.xz linux-dev-d716a4dfbbdf0d4731d596a96e5f4b0d892ac168.zip | |
netfilter: netns nf_conntrack: per-netns conntrack accounting
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index ade0bb3ab2e3..bb26460d897c 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1039,7 +1039,7 @@ void nf_conntrack_cleanup(struct net *net) nf_ct_free_hashtable(net->ct.hash, net->ct.hash_vmalloc, nf_conntrack_htable_size); - nf_conntrack_acct_fini(); + nf_conntrack_acct_fini(net); nf_conntrack_expect_fini(net); free_percpu(net->ct.stat); nf_conntrack_helper_fini(); @@ -1191,7 +1191,7 @@ int nf_conntrack_init(struct net *net) if (ret < 0) goto out_fini_expect; - ret = nf_conntrack_acct_init(); + ret = nf_conntrack_acct_init(net); if (ret < 0) goto out_fini_helper; |