From d43e5a796b00c6e989af5c29fb92a36c11909256 Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Tue, 22 Jun 2021 11:53:38 -0700 Subject: [PATCH] Revert "ANDROID: GKI: Enable some necessary CFG80211 configs for WIFI" This reverts commit bba0d8a87e2679388c1c09bd47be0274fbe6a69a. CFG80211 changing to a module so these configs go into device-specific defconfig fragments. Bug: 189918667 Change-Id: Ie4b70407369da3c865541e4857c3ba18fec24587 --- arch/arm64/configs/gki_defconfig | 4 ++-- arch/x86/configs/gki_defconfig | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 4dc06f9c2f37..32e10b8c1678 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -268,8 +268,8 @@ CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y CONFIG_CFG80211=y CONFIG_NL80211_TESTMODE=y -CONFIG_CFG80211_CERTIFICATION_ONUS=y -CONFIG_CFG80211_REG_CELLULAR_HINTS=y +# CONFIG_CFG80211_DEFAULT_PS is not set +# CONFIG_CFG80211_CRDA_SUPPORT is not set CONFIG_MAC80211=y CONFIG_RFKILL=y CONFIG_PCI=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index c8bf506d767e..33b5e20c95de 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -244,8 +244,6 @@ CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y CONFIG_CFG80211=y CONFIG_NL80211_TESTMODE=y -CONFIG_CFG80211_CERTIFICATION_ONUS=y -CONFIG_CFG80211_REG_CELLULAR_HINTS=y # CONFIG_CFG80211_DEFAULT_PS is not set # CONFIG_CFG80211_CRDA_SUPPORT is not set CONFIG_MAC80211=y