Commit bbd4866e authored by Bart De Schuymer's avatar Bart De Schuymer Committed by David S. Miller

[BRIDGE]: Only build br_netfilter when INET is enabled.

parent 26e4bddd
...@@ -175,7 +175,6 @@ source "net/decnet/Kconfig" ...@@ -175,7 +175,6 @@ source "net/decnet/Kconfig"
config BRIDGE config BRIDGE
tristate "802.1d Ethernet Bridging" tristate "802.1d Ethernet Bridging"
depends on INET
---help--- ---help---
If you say Y here, then your Linux box will be able to act as an If you say Y here, then your Linux box will be able to act as an
Ethernet bridge, which means that the different Ethernet segments it Ethernet bridge, which means that the different Ethernet segments it
......
...@@ -8,6 +8,9 @@ bridge-y := br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \ ...@@ -8,6 +8,9 @@ bridge-y := br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \
br_ioctl.o br_notify.o br_stp.o br_stp_bpdu.o \ br_ioctl.o br_notify.o br_stp.o br_stp_bpdu.o \
br_stp_if.o br_stp_timer.o br_stp_if.o br_stp_timer.o
# br_netfilter only deals with IPv4 and ARP filtering, both are INET protocols
ifeq ($(CONFIG_INET),y)
bridge-$(CONFIG_NETFILTER) += br_netfilter.o bridge-$(CONFIG_NETFILTER) += br_netfilter.o
endif
obj-$(CONFIG_BRIDGE_NF_EBTABLES) += netfilter/ obj-$(CONFIG_BRIDGE_NF_EBTABLES) += netfilter/
...@@ -34,7 +34,7 @@ static int __init br_init(void) ...@@ -34,7 +34,7 @@ static int __init br_init(void)
{ {
printk(KERN_INFO "NET4: Ethernet Bridge 008 for NET4.0\n"); printk(KERN_INFO "NET4: Ethernet Bridge 008 for NET4.0\n");
#ifdef CONFIG_NETFILTER #if defined(CONFIG_INET) && defined(CONFIG_NETFILTER)
if (br_netfilter_init()) if (br_netfilter_init())
return 1; return 1;
#endif #endif
...@@ -52,7 +52,7 @@ static int __init br_init(void) ...@@ -52,7 +52,7 @@ static int __init br_init(void)
static void __exit br_deinit(void) static void __exit br_deinit(void)
{ {
#ifdef CONFIG_NETFILTER #if defined(CONFIG_INET) && defined(CONFIG_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