From 5fef728db34592471a68153478f8bfc6ffbfc2c9 Mon Sep 17 00:00:00 2001
From: Alan Chen <quic_alache@quicinc.com>
Date: Fri, 23 Jun 2023 17:50:37 -0700
Subject: [PATCH] qcacld-3.0: Fix bazel-related changes

With changes to bazel in upstream kernel, driver is currently not
building properly. Fix these bazel-related changes to be in line with
upstream kernel changes and resolve the build issues.

Change-Id: I99fb7b1aaa8cd70b4326a858d46de7c034b0549f
CRs-Fixed: 3539623
---
 configs/pineapple_gki_kiwi-v2_defconfig | 6 ------
 wlan_qcacld3_modules.bzl                | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/configs/pineapple_gki_kiwi-v2_defconfig b/configs/pineapple_gki_kiwi-v2_defconfig
index aca36377f7..5e34ba0aa3 100644
--- a/configs/pineapple_gki_kiwi-v2_defconfig
+++ b/configs/pineapple_gki_kiwi-v2_defconfig
@@ -103,7 +103,6 @@ CONFIG_FEATURE_WLAN_PRE_CAC=y
 CONFIG_FEATURE_WLAN_RA_FILTERING=y
 CONFIG_FEATURE_WLAN_SCAN_PNO=y
 CONFIG_FEATURE_WLAN_WAPI=y
-CONFIG_FEATURE_WLM_STATS=y
 CONFIG_FIX_TXDMA_LIMITATION=y
 CONFIG_FOURTH_CONNECTION=y
 CONFIG_FW_THERMAL_THROTTLE=y
@@ -145,7 +144,6 @@ CONFIG_PLD_PCIE_CNSS_FLAG=y
 CONFIG_PLD_PCIE_INIT_FLAG=y
 CONFIG_POWER_MANAGEMENT_OFFLOAD=y
 CONFIG_PTT_SOCK_SVC_ENABLE=y
-CONFIG_QCA_CLD_WLAN=m
 CONFIG_QCA_DFS_BW_PUNCTURE=y
 CONFIG_QCA_GET_TSF_VIA_REG=y
 CONFIG_QCA_MONITOR_PKT_SUPPORT=y
@@ -356,10 +354,6 @@ CONFIG_WMI_ROAM_SUPPORT=y
 CONFIG_WMI_SEND_RECV_QMI=y
 CONFIG_WMI_STA_SUPPORT=y
 CONFIG_CFG80211_RU_PUNCT_NOTIFY=y
-CONFIG_LITTLE_ENDIAN=y
-CONFIG_FEATURE_WLAN_WAPI=y
-CONFIG_TX_TID_OVERRIDE=y
-CONFIG_HIF_PCI=y
 CONFIG_CFG80211_MLO_KEY_OPERATION_SUPPORT=y
 CONFIG_CFG80211_EXTERNAL_AUTH_MLO_SUPPORT=y
 CONFIG_CFG80211_EXT_FEATURE_SECURE_NAN=y
diff --git a/wlan_qcacld3_modules.bzl b/wlan_qcacld3_modules.bzl
index 9a2c925ecf..681bb1ffdd 100644
--- a/wlan_qcacld3_modules.bzl
+++ b/wlan_qcacld3_modules.bzl
@@ -2043,7 +2043,7 @@ _conditional_srcs = {
     },
     "CONFIG_AFC_SUPPORT": {
         True: [
-           "core/hdd/src/wlan_hdd_afc.c",
+            "core/hdd/src/wlan_hdd_afc.c",
         ],
     },
     "CONFIG_WLAN_FEATURE_LL_LT_SAP": {
@@ -2058,7 +2058,7 @@ _conditional_srcs = {
 def _define_module_for_target_variant_chipset(target, variant, chipset):
     tvc = "{}_{}_{}".format(target, variant, chipset)
     tv = "{}_{}".format(target, variant)
-    name = "qca_cld_{}".format(tvc)
+    name = "{}_qca_cld_{}".format(tv, chipset)
     hw = _chipset_hw_map[chipset]
     chipset_ipaths = _chipset_header_map[chipset]
     hw_ipaths = _hw_header_map[hw]