Skip to content

Commit

Permalink
netfilter: nf_conntrack: fix compilation if sysctl are disabled
Browse files Browse the repository at this point in the history
In (f94161c netfilter: nf_conntrack: move initialization out of pernet
operations), some ifdefs were missing for sysctl dependent code.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Pablo Neira Ayuso committed Jan 23, 2013
1 parent c296bb4 commit 5f9f946
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions net/netfilter/nf_conntrack_standalone.c
Original file line number Diff line number Diff line change
Expand Up @@ -563,10 +563,14 @@ static int __init nf_conntrack_standalone_init(void)
if (ret < 0)
goto out_start;

#ifdef CONFIG_SYSCTL
nf_ct_netfilter_header =
register_net_sysctl(&init_net, "net", nf_ct_netfilter_table);
if (!nf_ct_netfilter_header)
if (!nf_ct_netfilter_header) {
pr_err("nf_conntrack: can't register to sysctl.\n");
goto out_sysctl;
}
#endif

ret = register_pernet_subsys(&nf_conntrack_net_ops);
if (ret < 0)
Expand All @@ -576,9 +580,10 @@ static int __init nf_conntrack_standalone_init(void)
return 0;

out_pernet:
#ifdef CONFIG_SYSCTL
unregister_net_sysctl_table(nf_ct_netfilter_header);
out_sysctl:
pr_err("nf_conntrack: can't register to sysctl.\n");
#endif
nf_conntrack_cleanup_end();
out_start:
return ret;
Expand All @@ -588,7 +593,9 @@ static void __exit nf_conntrack_standalone_fini(void)
{
nf_conntrack_cleanup_start();
unregister_pernet_subsys(&nf_conntrack_net_ops);
#ifdef CONFIG_SYSCTL
unregister_net_sysctl_table(nf_ct_netfilter_header);
#endif
nf_conntrack_cleanup_end();
}

Expand Down

0 comments on commit 5f9f946

Please sign in to comment.