From 16bf78bd46d319d9248b0ac9926e46715ecdc7c2 Mon Sep 17 00:00:00 2001 From: Connor O'Brien Date: Mon, 16 Mar 2020 19:44:47 -0700 Subject: [PATCH] ANDROID: gki_defconfig: enable CONFIG_BRIDGE Set CONFIG_BRIDGE=y for arm64 and x86 gki defconfigs Bug: 151683251 Signed-off-by: Connor O'Brien Change-Id: Ifa34d56b2b8e497d3d696f8c80e137ffc4a93280 --- 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 60c7a4cfc8fe..f7f97a8a070f 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -190,6 +190,7 @@ CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y CONFIG_TIPC=y CONFIG_L2TP=y +CONFIG_BRIDGE=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 55533d041496..30b81fedc7c9 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -160,6 +160,7 @@ CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y CONFIG_TIPC=y CONFIG_L2TP=y +CONFIG_BRIDGE=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y CONFIG_NET_SCH_INGRESS=y