summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Jones <joneslee@google.com>2024-04-08 08:53:55 +0100
committerTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-04-23 19:17:23 +0000
commitb23f669cb4e118b9bc9eff68c4e1f8e44af83362 (patch)
treebfb8a7b73d5751b3f38c74c0bbd677d25d7818a5
parent3d11428ad8baec63493e03a4f0759e379f31f36d (diff)
downloadcommon-b23f669cb4e118b9bc9eff68c4e1f8e44af83362.tar.gz
ANDROID: gki_defconfig: Realign succinct defconfigs with latest IP_NF_ARPTABLES changes
Required after a recent rework of the ARP tables Kconfig entries. Fixes: 4654467dc7e1 ("netfilter: arptables: allow xtables-nft only builds") Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: Id4b825e3abcbe96f0f7da3a2edc3c9fa898d1ba9
-rw-r--r--arch/arm64/configs/gki_defconfig1
-rw-r--r--arch/riscv/configs/gki_defconfig1
-rw-r--r--arch/x86/configs/gki_defconfig1
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 6bb267547276..98ddb657e8dd 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -213,7 +213,6 @@ CONFIG_IP_NF_TARGET_REDIRECT=y
CONFIG_IP_NF_MANGLE=y
CONFIG_IP_NF_RAW=y
CONFIG_IP_NF_SECURITY=y
-CONFIG_IP_NF_ARPTABLES=y
CONFIG_IP_NF_ARPFILTER=y
CONFIG_IP_NF_ARP_MANGLE=y
CONFIG_IP6_NF_IPTABLES=y
diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig
index 666e05fb8d86..14cd051cab49 100644
--- a/arch/riscv/configs/gki_defconfig
+++ b/arch/riscv/configs/gki_defconfig
@@ -197,7 +197,6 @@ CONFIG_IP_NF_TARGET_REDIRECT=y
CONFIG_IP_NF_MANGLE=y
CONFIG_IP_NF_RAW=y
CONFIG_IP_NF_SECURITY=y
-CONFIG_IP_NF_ARPTABLES=y
CONFIG_IP_NF_ARPFILTER=y
CONFIG_IP_NF_ARP_MANGLE=y
CONFIG_IP6_NF_IPTABLES=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index bd5bbbd65790..bd646c7a112d 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -210,7 +210,6 @@ CONFIG_IP_NF_TARGET_REDIRECT=y
CONFIG_IP_NF_MANGLE=y
CONFIG_IP_NF_RAW=y
CONFIG_IP_NF_SECURITY=y
-CONFIG_IP_NF_ARPTABLES=y
CONFIG_IP_NF_ARPFILTER=y
CONFIG_IP_NF_ARP_MANGLE=y
CONFIG_IP6_NF_IPTABLES=y