lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: nf_conntrack: fix compilation if sysctl are disabled

Browse Source 
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>
This commit is contained in:
Pablo Neira Ayuso
2013-01-23 15:12:25 +01:00
parent c296bb4d5d
commit 5f9f946b39
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/netfilter/nf_conntrack_standalone.c
View File

@@ -563,10 +563,14 @@ static int __init nf_conntrack_standalone_init(void)
if (ret < 0) if (ret < 0)
goto out_start; goto out_start;
#ifdef CONFIG_SYSCTL
nf_ct_netfilter_header = nf_ct_netfilter_header =
register_net_sysctl(&init_net, "net", nf_ct_netfilter_table); 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; goto out_sysctl;
}
#endif
ret = register_pernet_subsys(&nf_conntrack_net_ops); ret = register_pernet_subsys(&nf_conntrack_net_ops);
if (ret < 0) if (ret < 0)
@@ -576,9 +580,10 @@ static int __init nf_conntrack_standalone_init(void)
return 0; return 0;
out_pernet: out_pernet:
#ifdef CONFIG_SYSCTL
unregister_net_sysctl_table(nf_ct_netfilter_header); unregister_net_sysctl_table(nf_ct_netfilter_header);
out_sysctl: out_sysctl:
pr_err("nf_conntrack: can't register to sysctl.\n"); #endif
nf_conntrack_cleanup_end(); nf_conntrack_cleanup_end();
out_start: out_start:
return ret; return ret;
@@ -588,7 +593,9 @@ static void __exit nf_conntrack_standalone_fini(void)
{ {
nf_conntrack_cleanup_start(); nf_conntrack_cleanup_start();
unregister_pernet_subsys(&nf_conntrack_net_ops); unregister_pernet_subsys(&nf_conntrack_net_ops);
#ifdef CONFIG_SYSCTL
unregister_net_sysctl_table(nf_ct_netfilter_header); unregister_net_sysctl_table(nf_ct_netfilter_header);
#endif
nf_conntrack_cleanup_end(); nf_conntrack_cleanup_end();
} }