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

diff --git a/net/Kconfig b/net/Kconfig
index df5b61a721e5f33f41842ae29c627980ebf4de59..7b68450d1252a962812eb0a8c466a167612c953b 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -175,7 +175,6 @@ source "net/decnet/Kconfig"
 
 config BRIDGE
        tristate "802.1d Ethernet Bridging"
-       depends on INET
        ---help---
          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

diff --git a/net/bridge/Makefile b/net/bridge/Makefile
index d86edb7281b0fb429e772014918850d68796ac18..a337e60881ee1d1bdf5234f8ab87683673fa5b4e 100644 (file)
--- a/net/bridge/Makefile
+++ b/net/bridge/Makefile
@@ -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_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
+endif
 
 obj-$(CONFIG_BRIDGE_NF_EBTABLES) += netfilter/

diff --git a/net/bridge/br.c b/net/bridge/br.c
index 7f7ccdd495fd9c7a8d60cdbb23ed30475932c3bc..bf41aa2c61dd87f1d3366cc60f47fecdf8a3a22e 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -34,7 +34,7 @@ static int __init br_init(void)
 {
        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())
                return 1;
 #endif
@@ -52,7 +52,7 @@ static int __init br_init(void)
 
 static void __exit br_deinit(void)
 {
-#ifdef CONFIG_NETFILTER
+#if defined(CONFIG_INET) && defined(CONFIG_NETFILTER)
        br_netfilter_fini();
 #endif
        unregister_netdevice_notifier(&br_device_notifier);