summarylogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorBaptiste Jonglez2016-03-22 13:28:44 +0100
committerBaptiste Jonglez2016-03-22 13:28:44 +0100
commit7d4786e823353caa55a1fef981d1fba11137d571 (patch)
tree479f189859064eed2adf928d46819645bbd52413 /config
parenta1a666590e37775af0c7930adaf88c3f6f020e81 (diff)
downloadaur-7d4786e823353caa55a1fef981d1fba11137d571.tar.gz
linux-mptcp: #46714 update MROUTE options for IPV4 and IPV6
See r249341 in upstream arch packages.
Diffstat (limited to 'config')
-rw-r--r--config6
1 files changed, 4 insertions, 2 deletions
diff --git a/config b/config
index 2bff5db8625d..3e6ad15118b2 100644
--- a/config
+++ b/config
@@ -814,7 +814,7 @@ CONFIG_NET_IP_TUNNEL=m
CONFIG_NET_IPGRE=m
# CONFIG_NET_IPGRE_BROADCAST is not set
CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
CONFIG_SYN_COOKIES=y
@@ -883,7 +883,9 @@ CONFIG_IPV6_TUNNEL=m
CONFIG_IPV6_GRE=m
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
CONFIG_NETLABEL=y
CONFIG_MPTCP=y
CONFIG_MPTCP_PM_ADVANCED=y