[BRIDGE]: Fix netfilter config tests.

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

[BRIDGE]: Fix netfilter config tests.
The br_netfilter_{init,fini}() calls need to be guarded by BRIDGE_NETFILTER, from Michal Janusz Miroslaw.
5d9ff6d0 · Bart De Schuymer · Linus Torvalds · 0406f5bd · 5d9ff6d0
Commit 5d9ff6d0 authored Nov 25, 2003 by Bart De Schuymer Committed by Linus Torvalds Nov 25, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

net/bridge/br.c net/bridge/br.c +2 -2

No files found.
--- 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);