qcacld-3.0: Address mScanPending issues

Address the following issues identified for mScanPending:

* Do not ensure mScanPending is set in hdd_cfg80211_scan_done_callback
* Always set mScanPending to false in hdd_start_all_adapters

Change-Id: I233b8208cea0661c1d8834704e44a311e662dc47
CRs-Fixed: 2073232
This commit is contained in:
Dustin Brown 2017-07-07 12:52:24 -07:00 • committed by snandini
commit a7e6a5c19d
2 changed files with 5 additions and 7 deletions

View file

@ -4642,6 +4642,8 @@ QDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx)
hdd_wmm_init(adapter);
adapter->scan_info.mScanPending = false;
switch (adapter->device_mode) {
case QDF_STA_MODE:
case QDF_P2P_CLIENT_MODE:
@ -4653,7 +4655,6 @@ QDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx)
hdd_init_station_mode(adapter);
/* Open the gates for HDD to receive Wext commands */
adapter->isLinkUpSvcNeeded = false;
adapter->scan_info.mScanPending = false;
/* Indicate disconnect event to supplicant
* if associated previously

View file

@ -505,19 +505,16 @@ static QDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle,
uint32_t size = 0;
ret = wlan_hdd_validate_context(hddctx);
if (0 != ret)
if (ret) {
hdd_err("Invalid hdd_ctx; Drop results for scanId %d", scanId);
return QDF_STATUS_E_INVAL;
}
hdd_debug("called with hal = %p, pContext = %p, ID = %d, status = %d",
halHandle, pContext, (int)scanId, (int)status);
pScanInfo->mScanPendingCounter = 0;
if (pScanInfo->mScanPending != true) {
QDF_ASSERT(pScanInfo->mScanPending);
goto allow_suspend;
}
if (QDF_STATUS_SUCCESS !=
wlan_hdd_scan_request_dequeue(hddctx, scanId, &req, &source,
&scan_time)) {