Commit 5f9f946b39bff31bc9a4a8be18cef3354d3382ae
1 parent
c296bb4d5d
netfilter: nf_conntrack: fix compilation if sysctl are disabled
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>
Showing 1 changed file with 9 additions and 2 deletions Side-by-side Diff
net/netfilter/nf_conntrack_standalone.c
| ... | ... | @@ -563,10 +563,14 @@ |
| 563 | 563 | if (ret < 0) |
| 564 | 564 | goto out_start; |
| 565 | 565 | |
| 566 | +#ifdef CONFIG_SYSCTL | |
| 566 | 567 | nf_ct_netfilter_header = |
| 567 | 568 | register_net_sysctl(&init_net, "net", nf_ct_netfilter_table); |
| 568 | - if (!nf_ct_netfilter_header) | |
| 569 | + if (!nf_ct_netfilter_header) { | |
| 570 | + pr_err("nf_conntrack: can't register to sysctl.\n"); | |
| 569 | 571 | goto out_sysctl; |
| 572 | + } | |
| 573 | +#endif | |
| 570 | 574 | |
| 571 | 575 | ret = register_pernet_subsys(&nf_conntrack_net_ops); |
| 572 | 576 | if (ret < 0) |
| 573 | 577 | |
| ... | ... | @@ -576,9 +580,10 @@ |
| 576 | 580 | return 0; |
| 577 | 581 | |
| 578 | 582 | out_pernet: |
| 583 | +#ifdef CONFIG_SYSCTL | |
| 579 | 584 | unregister_net_sysctl_table(nf_ct_netfilter_header); |
| 580 | 585 | out_sysctl: |
| 581 | - pr_err("nf_conntrack: can't register to sysctl.\n"); | |
| 586 | +#endif | |
| 582 | 587 | nf_conntrack_cleanup_end(); |
| 583 | 588 | out_start: |
| 584 | 589 | return ret; |
| 585 | 590 | |
| ... | ... | @@ -588,7 +593,9 @@ |
| 588 | 593 | { |
| 589 | 594 | nf_conntrack_cleanup_start(); |
| 590 | 595 | unregister_pernet_subsys(&nf_conntrack_net_ops); |
| 596 | +#ifdef CONFIG_SYSCTL | |
| 591 | 597 | unregister_net_sysctl_table(nf_ct_netfilter_header); |
| 598 | +#endif | |
| 592 | 599 | nf_conntrack_cleanup_end(); |
| 593 | 600 | } |
| 594 | 601 |