wrong roam scan state (wlan_sm.c)
When the init scan command from UMAC to FW fails and at the same
time if abort is initiated by UMAC which in turn sends
Finish scan request to the FW for the scan which is not
successfully initiated by UMAC.This causes the FW to throw
assert.
Change-Id: I1d832e549329b6fdd7ae6b7e4fa98a272c983bda
CRs-fixed: 501122
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index 35a48d3..b52aa18 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -3474,14 +3474,26 @@
if( pMac->lim.abortScan &&
(eLIM_HAL_INIT_SCAN_WAIT_STATE == pMac->lim.gLimHalScanState) )
{
- limLog( pMac, LOGW, FL(" finish scan") );
+ limLog( pMac, LOGW, FL(" abort scan") );
pMac->lim.abortScan = 0;
limDeactivateAndChangeTimer(pMac, eLIM_MIN_CHANNEL_TIMER);
limDeactivateAndChangeTimer(pMac, eLIM_MAX_CHANNEL_TIMER);
//Set the resume channel to Any valid channel (invalid).
//This will instruct HAL to set it to any previous valid channel.
peSetResumeChannel(pMac, 0, 0);
- limSendHalFinishScanReq(pMac, eLIM_HAL_FINISH_SCAN_WAIT_STATE);
+ if (status != eHAL_STATUS_SUCCESS)
+ {
+ PELOGW(limLog(pMac, LOGW, FL("InitScnRsp failed status=%d"),status);)
+ pMac->lim.gLimHalScanState = eLIM_HAL_IDLE_SCAN_STATE;
+ pMac->lim.gLimNumOfConsecutiveBkgndScanFailure += 1;
+ limCompleteMlmScan(pMac, eSIR_SME_HAL_SCAN_INIT_FAILED);
+ return;
+ }
+ else
+ {
+ limSendHalFinishScanReq(pMac, eLIM_HAL_FINISH_SCAN_WAIT_STATE);
+ }
+
}
switch(pMac->lim.gLimHalScanState)
{