From 71961045fd1966351205e2329f5268127f44759c Mon Sep 17 00:00:00 2001 From: Yingying Tang Date: Tue, 21 Feb 2017 15:47:03 +0800 Subject: [PATCH] qcacld-3.0: Disable LFR3.0 for SDX20 Since wifi chip do not supprot LFR3.0 on SDX20, disable LFR3.0 feature in Kbuild, and fix a compilation error. CRs-Fixed: 2009403 Change-Id: I16eb3bd68d5564801be9cbcf9db1386cb0e3953b --- Kbuild | 2 ++ core/sme/inc/csr_internal.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Kbuild b/Kbuild index a8eb85bd85..3e77f40f3e 100644 --- a/Kbuild +++ b/Kbuild @@ -72,7 +72,9 @@ ifeq ($(KERNEL_BUILD), 0) #Flag to enable Legacy Fast Roaming2(LFR2) CONFIG_QCACLD_WLAN_LFR2 := y #Flag to enable Legacy Fast Roaming3(LFR3) + ifneq ($(CONFIG_ARCH_SDXHEDGEHOG), y) CONFIG_QCACLD_WLAN_LFR3 := y + endif # JB kernel has CPU enablement patches, so enable ifeq ($(CONFIG_ROME_IF),pci) diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 7e116627c5..3f77521025 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -1329,6 +1329,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, struct sSirSmeRoamOffloadSynchInd *roam_synch_ind_ptr, tpSirBssDescription bss_desc_ptr); void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf); +#endif #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR void csr_roaming_report_diag_event(tpAniSirGlobal mac_ctx, roam_offload_synch_ind *roam_synch_ind_ptr, @@ -1339,7 +1340,7 @@ static inline void csr_roaming_report_diag_event(tpAniSirGlobal mac_ctx, eCsrDiagWlanStatusEventReason reason) {} #endif -#endif + bool csr_store_joinreq_param(tpAniSirGlobal mac_ctx, tCsrRoamProfile *profile, tScanResultHandle scan_cache,