From 2a2ec23ac03397f68bde41821472d37d82904c77 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 24 May 2009 21:29:14 +0000 Subject: [PATCH] port r16044 to 8.09 SVN-Revision: 16045 --- package/kernel/modules/network.mk | 1 + target/linux/generic-2.6/config-2.6.23 | 4 +++- target/linux/generic-2.6/config-2.6.24 | 4 +++- target/linux/generic-2.6/config-2.6.25 | 4 +++- target/linux/generic-2.6/config-2.6.26 | 4 +++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk index 6a1a1dbdba..fd5b6ccac2 100644 --- a/package/kernel/modules/network.mk +++ b/package/kernel/modules/network.mk @@ -231,6 +231,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.23 b/target/linux/generic-2.6/config-2.6.23 index 0eb64e478b..419e83e306 100644 --- a/target/linux/generic-2.6/config-2.6.23 +++ b/target/linux/generic-2.6/config-2.6.23 @@ -550,7 +550,7 @@ CONFIG_IP_ADVANCED_ROUTER=y # CONFIG_IP_DCCP is not set CONFIG_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE 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=m @@ -623,6 +623,8 @@ CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TFTP=m +# 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=y diff --git a/target/linux/generic-2.6/config-2.6.24 b/target/linux/generic-2.6/config-2.6.24 index 16d7db3419..4f673a75c5 100644 --- a/target/linux/generic-2.6/config-2.6.24 +++ b/target/linux/generic-2.6/config-2.6.24 @@ -565,7 +565,7 @@ CONFIG_IP_ADVANCED_ROUTER=y # CONFIG_IP_DCCP is not set CONFIG_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE 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=m @@ -639,6 +639,8 @@ CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TFTP=m +# 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=y diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25 index 3ddc24a976..0032005063 100644 --- a/target/linux/generic-2.6/config-2.6.25 +++ b/target/linux/generic-2.6/config-2.6.25 @@ -579,7 +579,7 @@ CONFIG_IP_ADVANCED_ROUTER=y # CONFIG_IP_DCCP is not set CONFIG_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE 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=m @@ -652,6 +652,8 @@ CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TFTP=m +# 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=y diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26 index 5335c2a341..4bd87c5b02 100644 --- a/target/linux/generic-2.6/config-2.6.26 +++ b/target/linux/generic-2.6/config-2.6.26 @@ -598,7 +598,7 @@ CONFIG_IP_ADVANCED_ROUTER=y # CONFIG_IP_DCCP is not set CONFIG_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE 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=m @@ -671,6 +671,8 @@ CONFIG_IP_NF_TARGET_TOS=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TFTP=m +# 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=y -- 2.30.2