---

yaml --- r: 194525 b: refs/heads/master c: 08b202b h: refs/heads/master i: 194523: 9d2e7a4 v: v3
git-mirror · Apr 23, 2010 · c42a5bb · c42a5bb
1 parent 0634fe6
commit c42a5bb
Show file tree

Hide file tree

Showing 4 changed files with 430 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ef2a9a59854994bace13b5c4f7edc2c8d4d124e
+refs/heads/master: 08b202b6726459626c73ecfa08fcdc8c3efc76c2
diff --git a/trunk/net/bridge/Kconfig b/trunk/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.