From a229a30d993f9342c2f14b506ee4e45633d79478 Mon Sep 17 00:00:00 2001 From: Carlos Llamas Date: Wed, 29 Jun 2022 16:48:53 +0000 Subject: [PATCH] ANDROID: gki_defconfig: enable IPV6_MROUTE Enable support for IPv6 multicast forwarding, required for devices with border routing capabilities. Note this option will likely be unset after making ipv6 a GKI module. Bug: 233821827 Signed-off-by: Carlos Llamas Change-Id: I0ffabbe21373ac23bc353abda51862eba0135972 (cherry picked from commit 88b166cbf253597ca9ad00be17fc6ae4864d0190) --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index f573d60b7dfd..662227929ce2 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -154,6 +154,7 @@ CONFIG_IPV6_MIP6=y CONFIG_IPV6_VTI=y CONFIG_IPV6_GRE=y CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_MROUTE=y CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_SECMARK=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 7c4347701c63..8c61c97d3214 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -135,6 +135,7 @@ CONFIG_IPV6_MIP6=y CONFIG_IPV6_VTI=y CONFIG_IPV6_GRE=y CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_MROUTE=y CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_SECMARK=y