diff options
| author | Ramji Jiyani <ramjiyani@google.com> | 2024-04-02 20:21:34 +0000 |
|---|---|---|
| committer | Ramji Jiyani <ramjiyani@google.com> | 2024-04-15 22:23:51 +0000 |
| commit | 803c55fa562e085b6b739b0b77ce6758c1a9f253 (patch) | |
| tree | 682c2b2e4a05420ba1974911b9e9c847db3b8a6e | |
| parent | 2e5dabcdd092cf980e6b024ffedabbf6478d52b3 (diff) | |
| download | common-803c55fa562e085b6b739b0b77ce6758c1a9f253.tar.gz | |
ANDROID: GKI: cfg/mac 80211 as vendor modules
Convert cfg80211.ko and mac80211.ko as vendor modules to
for merging upstream features.
Bug: 274416891
Test: TH
Test: bazel run //common:kernel_aarch64_abi_update_protected_exports
Change-Id: Ib310d2761c8d2a59104bde509fd2d8296117692f
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
(cherry picked from commit 29e7c5382238ad3901842bc89e95311cbd56f635)
| -rw-r--r-- | arch/arm64/configs/gki_defconfig | 5 | ||||
| -rw-r--r-- | arch/riscv/configs/gki_defconfig | 5 | ||||
| -rw-r--r-- | arch/x86/configs/gki_defconfig | 5 | ||||
| -rw-r--r-- | modules.bzl | 2 |
4 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 930325f715e4..47e1f02c7540 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -272,11 +272,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y -CONFIG_CFG80211=m -CONFIG_NL80211_TESTMODE=y -CONFIG_CFG80211_CERTIFICATION_ONUS=y -CONFIG_CFG80211_REG_CELLULAR_HINTS=y -CONFIG_MAC80211=m CONFIG_RFKILL=m CONFIG_NFC=m CONFIG_PCI=y diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig index 0656e68049de..24728cd50fb8 100644 --- a/arch/riscv/configs/gki_defconfig +++ b/arch/riscv/configs/gki_defconfig @@ -256,11 +256,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y -CONFIG_CFG80211=m -CONFIG_NL80211_TESTMODE=y -CONFIG_CFG80211_CERTIFICATION_ONUS=y -CONFIG_CFG80211_REG_CELLULAR_HINTS=y -CONFIG_MAC80211=m CONFIG_RFKILL=m CONFIG_NFC=m CONFIG_PCI=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index df8eca640221..eb21bd384b35 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -269,11 +269,6 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y -CONFIG_CFG80211=m -CONFIG_NL80211_TESTMODE=y -CONFIG_CFG80211_CERTIFICATION_ONUS=y -CONFIG_CFG80211_REG_CELLULAR_HINTS=y -CONFIG_MAC80211=m CONFIG_RFKILL=m CONFIG_NFC=m CONFIG_PCI=y diff --git a/modules.bzl b/modules.bzl index 6faec0e4ef20..3dd6bd4a2766 100644 --- a/modules.bzl +++ b/modules.bzl @@ -65,13 +65,11 @@ _COMMON_GKI_MODULES_LIST = [ "net/ieee802154/ieee802154_socket.ko", "net/l2tp/l2tp_core.ko", "net/l2tp/l2tp_ppp.ko", - "net/mac80211/mac80211.ko", "net/mac802154/mac802154.ko", "net/nfc/nfc.ko", "net/rfkill/rfkill.ko", "net/tipc/diag.ko", "net/tipc/tipc.ko", - "net/wireless/cfg80211.ko", ] # Deprecated - Use `get_gki_modules_list` function instead. |