Commit 5d9ff6d0 authored by Bart De Schuymer's avatar Bart De Schuymer Committed by Linus Torvalds

[BRIDGE]: Fix netfilter config tests.

The br_netfilter_{init,fini}() calls need to be guarded by
BRIDGE_NETFILTER, from Michal Janusz Miroslaw.
parent 0406f5bd
...@@ -32,7 +32,7 @@ int (*br_should_route_hook) (struct sk_buff **pskb) = NULL; ...@@ -32,7 +32,7 @@ int (*br_should_route_hook) (struct sk_buff **pskb) = NULL;
static int __init br_init(void) static int __init br_init(void)
{ {
#if defined(CONFIG_INET) && defined(CONFIG_NETFILTER) #ifdef CONFIG_BRIDGE_NETFILTER
if (br_netfilter_init()) if (br_netfilter_init())
return 1; return 1;
#endif #endif
...@@ -50,7 +50,7 @@ static int __init br_init(void) ...@@ -50,7 +50,7 @@ static int __init br_init(void)
static void __exit br_deinit(void) static void __exit br_deinit(void)
{ {
#if defined(CONFIG_INET) && defined(CONFIG_NETFILTER) #ifdef CONFIG_BRIDGE_NETFILTER
br_netfilter_fini(); br_netfilter_fini();
#endif #endif
unregister_netdevice_notifier(&br_device_notifier); unregister_netdevice_notifier(&br_device_notifier);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment