aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/Config-kernel.in17
-rw-r--r--target/linux/generic/config-3.182
-rw-r--r--target/linux/generic/config-4.142
-rw-r--r--target/linux/generic/config-4.42
-rw-r--r--target/linux/generic/config-4.92
5 files changed, 20 insertions, 5 deletions
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 678323efa1..fa06b50442 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -608,6 +608,17 @@ config KERNEL_SECCOMP
Build kernel with support for seccomp.
#
+# IPv4 configuration
+#
+
+config KERNEL_IP_MROUTE
+ bool "Enable IPv4 multicast routing"
+ default y
+ help
+ Multicast routing requires a multicast routing daemon in
+ addition to kernel support.
+
+#
# IPv6 configuration
#
@@ -623,7 +634,11 @@ if KERNEL_IPV6
def_bool y
config KERNEL_IPV6_MROUTE
- def_bool y
+ bool "Enable IPv6 multicast routing"
+ default y
+ help
+ Multicast routing requires a multicast routing daemon in
+ addition to kernel support.
config KERNEL_IPV6_PIMSM_V2
def_bool n
diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index 4909fa0cde..7df43be975 100644
--- a/target/linux/generic/config-3.18
+++ b/target/linux/generic/config-3.18
@@ -1630,7 +1630,7 @@ CONFIG_IPW2200_MONITOR=y
CONFIG_IP_ADVANCED_ROUTER=y
# CONFIG_IP_DCCP is not set
# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE is not set
CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_MULTIPLE_TABLES=y
diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index f156cda85c..5d8cc76dc0 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -2032,7 +2032,7 @@ CONFIG_IPW2200_MONITOR=y
CONFIG_IP_ADVANCED_ROUTER=y
# CONFIG_IP_DCCP is not set
# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE is not set
CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_MULTIPLE_TABLES=y
diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4
index 78163d0324..509d84dc00 100644
--- a/target/linux/generic/config-4.4
+++ b/target/linux/generic/config-4.4
@@ -1710,7 +1710,7 @@ CONFIG_IPW2200_MONITOR=y
CONFIG_IP_ADVANCED_ROUTER=y
# CONFIG_IP_DCCP is not set
# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE is not set
CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_MULTIPLE_TABLES=y
diff --git a/target/linux/generic/config-4.9 b/target/linux/generic/config-4.9
index 6ba893867a..3237b39b1f 100644
--- a/target/linux/generic/config-4.9
+++ b/target/linux/generic/config-4.9
@@ -1931,7 +1931,7 @@ CONFIG_IPW2200_MONITOR=y
CONFIG_IP_ADVANCED_ROUTER=y
# CONFIG_IP_DCCP is not set
# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE is not set
CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_MULTIPLE_TABLES=y