From 5d9ff6d05efae98f834e5acb2d825f6e3f8c48cb Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Tue, 25 Nov 2003 01:16:13 -0800 Subject: [PATCH] [BRIDGE]: Fix netfilter config tests. The br_netfilter_{init,fini}() calls need to be guarded by BRIDGE_NETFILTER, from Michal Janusz Miroslaw. --- net/bridge/br.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/bridge/br.c b/net/bridge/br.c index 3d90a9017bfc9..d4e9bc580edb2 100644 --- 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); -- 2.53.0