merge r16056 to 8.09

SVN-Revision: 16057

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index fd5b6ccac227346eda25493cf222a4107f3d8d50..48f64a2b02f2a020887dc61b76c783e4ab7e170b 100644 (file)
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -232,6 +232,7 @@ define KernelPackage/ipv6
        CONFIG_IPV6_PRIVACY=y \
        CONFIG_IPV6_MULTIPLE_TABLES=y \
        CONFIG_IPV6_MROUTE=y \
+       CONFIG_IPV6_PIMSM_V2=n \
        CONFIG_IPV6_SUBTREES=y
   FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ipv6)