Commit 96727239 authored Feb 12, 2015 by Geert Uytterhoeven Committed by David S. Miller Feb 12, 2015

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>

parent 4762fb98

net/bridge/br_netfilter.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -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)