From a83dd2336783ff9bb3b8ba25f3e8b2df5edf68a0 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 8 Apr 2020 14:32:52 -0700 Subject: [PATCH] ANDROID: gki_defconfig: add CONFIG_IPV6_SUBTREES Enable for both arm64 and x86. Change-Id: I091241994ac5199d6b4e8131cff2affb11569ade Bug: 153583123 Test: compile Signed-off-by: Will McVicker --- 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 537645d9d865..ce5c914e4773 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -119,6 +119,7 @@ CONFIG_INET6_IPCOMP=y CONFIG_IPV6_MIP6=y CONFIG_IPV6_VTI=y CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=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 2f4aeaeeb82f..ad00d38cad98 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -89,6 +89,7 @@ CONFIG_INET6_IPCOMP=y CONFIG_IPV6_MIP6=y CONFIG_IPV6_VTI=y CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_SECMARK=y