Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / net / 8021q / Kconfig

diff --git a/net/8021q/Kconfig b/net/8021q/Kconfig
index fa073a5..8f7517d 100644 (file)
--- a/net/8021q/Kconfig
+++ b/net/8021q/Kconfig
@@ -27,3 +27,14 @@ config VLAN_8021Q_GVRP
          automatic propagation of registered VLANs to switches.
 
          If unsure, say N.
+
+config VLAN_8021Q_MVRP
+       bool "MVRP (Multiple VLAN Registration Protocol) support"
+       depends on VLAN_8021Q
+       select MRP
+       help
+         Select this to enable MVRP end-system support. MVRP is used for
+         automatic propagation of registered VLANs to switches; it
+         supersedes GVRP and is not backwards-compatible.
+
+         If unsure, say N.