Merge tag 'xtensa-next-20130225' of git://github.com/czankel/xtensa-linux

[cascardo/linux.git] / net / bridge / Kconfig

diff --git a/net/bridge/Kconfig b/net/bridge/Kconfig
index 6dee7bf..aa0d3b2 100644 (file)
--- a/net/bridge/Kconfig
+++ b/net/bridge/Kconfig
@@ -46,3 +46,17 @@ config BRIDGE_IGMP_SNOOPING
          Say N to exclude this support and reduce the binary size.
 
          If unsure, say Y.
+
+config BRIDGE_VLAN_FILTERING
+       bool "VLAN filtering"
+       depends on BRIDGE
+       depends on VLAN_8021Q
+       default n
+       ---help---
+         If you say Y here, then the Ethernet bridge will be able selectively
+         receive and forward traffic based on VLAN information in the packet
+         any VLAN information configured on the bridge port or bridge device.
+
+         Say N to exclude this support and reduce the binary size.
+
+         If unsure, say Y.