From 3ead8ebbe26760ffaa2cfd06a8ee84547235fef4 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 24 May 2009 21:26:40 +0000 Subject: [PATCH] enable multicast routing by default git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16044 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netsupport.mk | 1 + target/linux/generic-2.6/config-2.6.21 | 4 +++- target/linux/generic-2.6/config-2.6.23 | 4 +++- target/linux/generic-2.6/config-2.6.25 | 4 +++- target/linux/generic-2.6/config-2.6.27 | 4 +++- target/linux/generic-2.6/config-2.6.28 | 4 +++- target/linux/generic-2.6/config-2.6.30 | 4 +++- 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 58fef4669..afe6b62fa 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -301,6 +301,7 @@ define KernelPackage/ipv6 CONFIG_IPV6 \ CONFIG_IPV6_PRIVACY=y \ CONFIG_IPV6_MULTIPLE_TABLES=y \ + CONFIG_IPV6_MROUTE=y \ CONFIG_IPV6_SUBTREES=y FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,ipv6) diff --git a/target/linux/generic-2.6/config-2.6.21 b/target/linux/generic-2.6/config-2.6.21 index c7d1a208e..512dc16ce 100644 --- a/target/linux/generic-2.6/config-2.6.21 +++ b/target/linux/generic-2.6/config-2.6.21 @@ -529,7 +529,7 @@ CONFIG_IP_DCCP_CCID3_RTO=100 CONFIG_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE is not set # CONFIG_IPMI_HANDLER is not set -# CONFIG_IP_MROUTE is not set +CONFIG_IP_MROUTE=y CONFIG_IP_MULTICAST=y CONFIG_IP_MULTIPLE_TABLES=y # CONFIG_IP_NF_AMANDA is not set @@ -602,6 +602,8 @@ CONFIG_IP_NF_TARGET_TCPMSS=y # CONFIG_IP_NF_TARGET_TTL is not set # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_PIMSM_V1 is not set +# CONFIG_IP_PIMSM_V2 is not set # CONFIG_IP_PNP is not set CONFIG_IP_ROUTE_FWMARK=y CONFIG_IP_ROUTE_MULTIPATH_CACHED=y diff --git a/target/linux/generic-2.6/config-2.6.23 b/target/linux/generic-2.6/config-2.6.23 index bc1d29749..2dec5de23 100644 --- a/target/linux/generic-2.6/config-2.6.23 +++ b/target/linux/generic-2.6/config-2.6.23 @@ -574,7 +574,7 @@ CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE is not set # CONFIG_IPMI_HANDLER is not set -# CONFIG_IP_MROUTE is not set +CONFIG_IP_MROUTE=y CONFIG_IP_MULTICAST=y CONFIG_IP_MULTIPLE_TABLES=y # CONFIG_IP_NF_AMANDA is not set @@ -645,6 +645,8 @@ CONFIG_IP_NF_SET_MAX=256 # CONFIG_IP_NF_TARGET_TTL is not set # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_PIMSM_V1 is not set +# CONFIG_IP_PIMSM_V2 is not set # CONFIG_IP_PNP is not set CONFIG_IP_ROUTE_FWMARK=y CONFIG_IP_ROUTE_MULTIPATH_CACHED=y diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25 index 0082e4e0b..a2408fa88 100644 --- a/target/linux/generic-2.6/config-2.6.25 +++ b/target/linux/generic-2.6/config-2.6.25 @@ -609,7 +609,7 @@ CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE is not set # CONFIG_IPMI_HANDLER is not set -# CONFIG_IP_MROUTE is not set +CONFIG_IP_MROUTE=y CONFIG_IP_MULTICAST=y CONFIG_IP_MULTIPLE_TABLES=y # CONFIG_IP_NF_AMANDA is not set @@ -679,6 +679,8 @@ CONFIG_IP_NF_SET_MAX=256 # CONFIG_IP_NF_TARGET_TTL is not set # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_PIMSM_V1 is not set +# CONFIG_IP_PIMSM_V2 is not set # CONFIG_IP_PNP is not set CONFIG_IP_ROUTE_FWMARK=y CONFIG_IP_ROUTE_MULTIPATH_CACHED=y diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27 index 63a066cca..8da33dc52 100644 --- a/target/linux/generic-2.6/config-2.6.27 +++ b/target/linux/generic-2.6/config-2.6.27 @@ -665,7 +665,7 @@ CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE is not set # CONFIG_IPMI_HANDLER is not set -# CONFIG_IP_MROUTE is not set +CONFIG_IP_MROUTE=y CONFIG_IP_MULTICAST=y CONFIG_IP_MULTIPLE_TABLES=y # CONFIG_IP_NF_AMANDA is not set @@ -735,6 +735,8 @@ CONFIG_IP_NF_SET_MAX=256 # CONFIG_IP_NF_TARGET_TTL is not set # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_PIMSM_V1 is not set +# CONFIG_IP_PIMSM_V2 is not set # CONFIG_IP_PNP is not set CONFIG_IP_ROUTE_FWMARK=y CONFIG_IP_ROUTE_MULTIPATH_CACHED=y diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28 index 25a0dd84d..f86b92432 100644 --- a/target/linux/generic-2.6/config-2.6.28 +++ b/target/linux/generic-2.6/config-2.6.28 @@ -720,7 +720,7 @@ CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE is not set # CONFIG_IPMI_HANDLER is not set -# CONFIG_IP_MROUTE is not set +CONFIG_IP_MROUTE=y CONFIG_IP_MULTICAST=y CONFIG_IP_MULTIPLE_TABLES=y # CONFIG_IP_NF_AMANDA is not set @@ -790,6 +790,8 @@ CONFIG_IP_NF_SET_MAX=256 # CONFIG_IP_NF_TARGET_TTL is not set # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_PIMSM_V1 is not set +# CONFIG_IP_PIMSM_V2 is not set # CONFIG_IP_PNP is not set CONFIG_IP_ROUTE_FWMARK=y CONFIG_IP_ROUTE_MULTIPATH_CACHED=y diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30 index f2be697a2..488e78acd 100644 --- a/target/linux/generic-2.6/config-2.6.30 +++ b/target/linux/generic-2.6/config-2.6.30 @@ -759,7 +759,7 @@ CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE is not set # CONFIG_IPMI_HANDLER is not set -# CONFIG_IP_MROUTE is not set +CONFIG_IP_MROUTE=y CONFIG_IP_MULTICAST=y CONFIG_IP_MULTIPLE_TABLES=y # CONFIG_IP_NF_AMANDA is not set @@ -830,6 +830,8 @@ CONFIG_IP_NF_SET_MAX=256 # CONFIG_IP_NF_TARGET_TTL is not set # CONFIG_IP_NF_TARGET_ULOG is not set # CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_PIMSM_V1 is not set +# CONFIG_IP_PIMSM_V2 is not set # CONFIG_IP_PNP is not set CONFIG_IP_ROUTE_FWMARK=y CONFIG_IP_ROUTE_MULTIPATH_CACHED=y -- 2.20.1