From b99814ce582ea2053f9b6d18e49b6b096c229d16 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Thu, 27 Feb 2020 13:49:46 -0800 Subject: [PATCH] ANDROID: gki_defconfig: Remove 'BRIDGE_NETFILTER is not set' BRIDGE_NETFILTER is disabled by default now. Bug: 147493341 Bug: 150463745 Test: presubmit Signed-off-by: Roman Kiryanov Change-Id: Ife8bb0bf2aacf64ad2594a449389e3706e54c5b5 --- arch/arm64/configs/gki_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 45a70279cd30..56b839d657a1 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -118,7 +118,6 @@ CONFIG_IPV6_MIP6=y CONFIG_IPV6_VTI=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_NETFILTER=y -# CONFIG_BRIDGE_NETFILTER is not set CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_EVENTS=y