[BRIDGE]: Fix netfilter config tests.

The br_netfilter_{init,fini}() calls need to be guarded by
BRIDGE_NETFILTER, from Michal Janusz Miroslaw.

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 3d90a9017bfc9ae5b92cba1f99516f4e806f5cea..d4e9bc580edb23e340e4db1c3db82392614cd030 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -32,7 +32,7 @@ int (*br_should_route_hook) (struct sk_buff **pskb) = NULL;
 
 static int __init br_init(void)
 {
-#if defined(CONFIG_INET) && defined(CONFIG_NETFILTER)
+#ifdef CONFIG_BRIDGE_NETFILTER
        if (br_netfilter_init())
                return 1;
 #endif
@@ -50,7 +50,7 @@ static int __init br_init(void)
 
 static void __exit br_deinit(void)
 {
-#if defined(CONFIG_INET) && defined(CONFIG_NETFILTER)
+#ifdef CONFIG_BRIDGE_NETFILTER
        br_netfilter_fini();
 #endif
        unregister_netdevice_notifier(&br_device_notifier);