diff options
| author |   Geert Uytterhoeven <geert@linux-m68k.org> | 2015-02-12 15:17:27 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-02-12 08:44:46 -0800 |
| commit | 9672723973f1e70189b8409eb2da189a980481c5 (patch) | |
| tree | fde99eb71fd6db08da4361bbff3ca67b2fe00f73 /net/bridge/br_netfilter.c | |
| parent | ipv6: fix possible deadlock in ip6_fl_purge / ip6_fl_gc (diff) | |
| download | linux-dev-9672723973f1e70189b8409eb2da189a980481c5.tar.xz linux-dev-9672723973f1e70189b8409eb2da189a980481c5.zip | |
bridge: netfilter: Move sysctl-specific error code inside #ifdef
If CONFIG_SYSCTL=n:
net/bridge/br_netfilter.c: In function ‘br_netfilter_init’:
net/bridge/br_netfilter.c:996: warning: label ‘err1’ defined but not used
Move the label and the code after it inside the existing #ifdef to get
rid of the warning.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_netfilter.c')
| -rw-r--r-- | net/bridge/br_netfilter.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 65728e0dc4ff..0ee453fad3de 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -987,15 +987,12 @@ static int __init br_netfilter_init(void) if (brnf_sysctl_header == NULL) { printk(KERN_WARNING "br_netfilter: can't register to sysctl.\n"); - ret = -ENOMEM; - goto err1; + nf_unregister_hooks(br_nf_ops, ARRAY_SIZE(br_nf_ops)); + return -ENOMEM; } #endif printk(KERN_NOTICE "Bridge firewalling registered\n"); return 0; -err1: - nf_unregister_hooks(br_nf_ops, ARRAY_SIZE(br_nf_ops)); - return ret; } static void __exit br_netfilter_fini(void) |