wlan: Don't update channel list in 1st scan when SET_FCC_CHANNEL is set
Currently SET_FCC_CHANNEL issues updated channel list to fw.
At the time of driver load, if scan is issued followed with
SET_FCC_CHANNEL, driver will send update channel list to fw.
Fw will stop ongoing scan because of that GUI will have very less
scan list.
Fix this with sending update channel list after scan is done.
Change-Id: I99465eeddf75ee6a3f525d43c227e2a8972a73e5
CRs-Fixed: 972208
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 9e2f2ee..92c7155 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -2937,7 +2937,8 @@
return -EINVAL;
}
- status = sme_handleSetFccChannel(pHddCtx->hHal, fcc_constraint);
+ status = sme_handleSetFccChannel(pHddCtx->hHal, fcc_constraint,
+ pHddCtx->scan_info.mScanPending);
if (status != eHAL_STATUS_SUCCESS)
ret = -EPERM;
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index daf16c9..cb13a47 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -833,6 +833,8 @@
csrScanCompleteCallback callback11dScanDone;
eCsrBand scanBandPreference; //This defines the band perference for scan
bool fcc_constraint;
+ /* flag to defer updated chanel list */
+ bool defer_update_channel_list;
}tCsrScanStruct;
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 06c738c..1bc0b6f 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -3927,7 +3927,8 @@
eHalStatus sme_SetRtsCtsHtVht(tHalHandle hHal, tANI_U32 set_value);
tANI_BOOLEAN sme_handleSetFccChannel(tHalHandle hHal,
- tANI_U8 fcc_constraint);
+ tANI_U8 fcc_constraint,
+ v_U32_t scan_pending);
eHalStatus sme_DeleteAllTDLSPeers(tHalHandle hHal, uint8_t sessionId);
eHalStatus sme_fatal_event_logs_req(tHalHandle hHal, tANI_U32 is_fatal,
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 3c5aa4b..7917f8d 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -5456,6 +5456,7 @@
tANI_U32 cbParsed;
tSirBssDescription *pSirBssDescription;
tANI_U32 cbBssDesc;
+ eHalStatus status;
tANI_U32 cbScanResult = GET_FIELD_OFFSET( tSirSmeScanRsp, bssDescription )
+ sizeof(tSirBssDescription); //We need at least one CB
@@ -5589,6 +5590,22 @@
*pfRemoveCommand = fRemoveCommand;
}
+ /*
+ * Currently SET_FCC_CHANNEL issues updated channel list to fw.
+ * At the time of driver load, if scan is issued followed with
+ * SET_FCC_CHANNEL, driver will send update channel list to fw.
+ * Fw will stop ongoing scan because of that GUI will have very less
+ * scan list.
+ * Update channel list should be sent to fw once scan is done
+ */
+ if (pMac->scan.defer_update_channel_list) {
+ status = csrUpdateChannelList(pMac);
+ if (eHAL_STATUS_SUCCESS != status)
+ smsLog(pMac, LOGE,
+ FL( "failed to update the supported channel list"));
+ pMac->scan.defer_update_channel_list = false;
+ }
+
#ifdef WLAN_AP_STA_CONCURRENCY
if (pMac->fScanOffload)
return fRet;
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 3dc10cd..b8dfe89 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -14012,7 +14012,8 @@
*
* Return: tANI_BOOLEAN.
*/
-tANI_BOOLEAN sme_handleSetFccChannel(tHalHandle hHal, tANI_U8 fcc_constraint)
+tANI_BOOLEAN sme_handleSetFccChannel(tHalHandle hHal, tANI_U8 fcc_constraint,
+ v_U32_t scan_pending)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
@@ -14022,10 +14023,14 @@
if (eHAL_STATUS_SUCCESS == status &&
(!sme_Is11dSupported(hHal)) )
{
- pMac->scan.fcc_constraint = !fcc_constraint;
- /* update the channel list to the firmware */
- csrUpdateChannelList(pMac);
+ pMac->scan.fcc_constraint = !fcc_constraint;
+ if (scan_pending == TRUE) {
+ pMac->scan.defer_update_channel_list = true;
+ } else {
+ /* update the channel list to the firmware */
+ csrUpdateChannelList(pMac);
+ }
}
sme_ReleaseGlobalLock(&pMac->sme);