wlan: Activate max channel timer at scan start
In current logic, only min channel timer is activated
on scan start which is deactivated on receiving probe
resp or beacon. On receiving probe resp or beacon,
max channel timer is activated. This will result in
dwell time to be 20msecs due to not receiving beacons
or between 40-60msecs depending on when beacons or probe
response is received.
Fix is to activate both max and min channel timer at scan
start so that dwell time will be between 20-40msecs.
Change-Id: I6f90bb80ebafe8de989a56a6cfe43c93b733c1cc
CRs-Fixed: 2195789
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index 6af7036..bc6cb0a 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -524,6 +524,16 @@
// Initialize max timer too
limDeactivateAndChangeTimer(pMac, eLIM_MAX_CHANNEL_TIMER);
+ if (tx_timer_activate(&pMac->lim.limTimers.gLimMaxChannelTimer) !=
+ TX_SUCCESS)
+ {
+ limLog(pMac, LOGE, FL("could not start max channel timer"));
+ limDeactivateAndChangeTimer(pMac, eLIM_MIN_CHANNEL_TIMER);
+ limDeactivateAndChangeTimer(pMac, eLIM_MAX_CHANNEL_TIMER);
+ limSendHalEndScanReq(pMac, channelNum,
+ eLIM_HAL_END_SCAN_WAIT_STATE);
+ return;
+ }
#if defined WLAN_FEATURE_VOWIFI
}
else
@@ -4040,6 +4050,11 @@
pMac->lim.limTimers.gLimPeriodicProbeReqTimer.sessionId = 0xff;
limDeactivateAndChangeTimer(pMac, eLIM_MIN_CHANNEL_TIMER);
limDeactivateAndChangeTimer(pMac, eLIM_PERIODIC_PROBE_REQ_TIMER);
+ /*
+ * Deactivate Max Channel timer as well since no probe resp/beacons
+ * are received.
+ */
+ limDeactivateAndChangeTimer(pMac, eLIM_MAX_CHANNEL_TIMER);
pMac->lim.probeCounter = 0;
if (pMac->lim.gLimCurrentScanChannelId <=
(tANI_U32)(pMac->lim.gpLimMlmScanReq->channelList.numChannels - 1))
diff --git a/CORE/MAC/src/pe/lim/limScanResultUtils.c b/CORE/MAC/src/pe/lim/limScanResultUtils.c
index 9937f38..90b5ae0 100644
--- a/CORE/MAC/src/pe/lim/limScanResultUtils.c
+++ b/CORE/MAC/src/pe/lim/limScanResultUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2014, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2014, 2016-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -80,18 +80,8 @@
* Beacon/Probe Response is received during active scanning.
* Deactivate MIN channel timer if running.
*/
-
limDeactivateAndChangeTimer(pMac,eLIM_MIN_CHANNEL_TIMER);
- if (tx_timer_activate(&pMac->lim.limTimers.gLimMaxChannelTimer)
- == TX_TIMER_ERROR)
- {
- /// Could not activate max channel timer.
- // Log error
- limLog(pMac,LOGP, FL("could not activate max channel timer"));
- limCompleteMlmScan(pMac, eSIR_SME_RESOURCES_UNAVAILABLE);
- return TX_TIMER_ERROR;
- }
}
return eSIR_SUCCESS;
} /*** end limDeactivateMinChannelTimerDuringScan() ***/