Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-drm-fsl-dcu.git] / net / bridge / Kconfig

diff --git a/net/bridge/Kconfig b/net/bridge/Kconfig
index d115d5cea5b6b63421769ccfc2b12bd922ac5918..9190ae462cb4215db167eaeb08164b11a052e63f 100644 (file)
--- a/net/bridge/Kconfig
+++ b/net/bridge/Kconfig
@@ -33,14 +33,14 @@ config BRIDGE
          If unsure, say N.
 
 config BRIDGE_IGMP_SNOOPING
-       bool "IGMP snooping"
+       bool "IGMP/MLD snooping"
        depends on BRIDGE
        depends on INET
        default y
        ---help---
          If you say Y here, then the Ethernet bridge will be able selectively
-         forward multicast traffic based on IGMP traffic received from each
-         port.
+         forward multicast traffic based on IGMP/MLD traffic received from
+         each port.
 
          Say N to exclude this support and reduce the binary size.