summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRatheesh S P <c_rpappa@qti.qualcomm.com>2015-11-26 15:42:05 +0530
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-04-21 20:09:57 +0530
commitbcc036044025abf361f7500a623f852a163dcea2 (patch)
tree355cacf0e5b80e12e149ae6e27d9912ac2a4db77
parentabec792ffe767649b40e83dd4224fdad23092709 (diff)
qcacld-2.0: Don't re-initialize timer if initialization is evaluated to zero
prima to qcacld-2.0 propagation Do not re-initialize periodic probe request timer if the calculated value for "initScheduleTimeInMsecs" from max channel timer is zero. Change-Id: I7cc03d84088c8c3f2b1e704c2e6c8c24c1a01189 CRs-Fixed: 909143
-rw-r--r--CORE/MAC/src/pe/lim/limTimerUtils.c21
1 files changed, 16 insertions, 5 deletions
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index 2968a47bdf69..8953530cb524 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -1111,12 +1111,23 @@ limDeactivateAndChangeTimer(tpAniSirGlobal pMac, tANI_U32 timerId)
limLog(pMac, LOGE, FL("BTC Active Scan Min Time is Not Set"));
}
}
- if (tx_timer_change(&pMac->lim.limTimers.gLimPeriodicProbeReqTimer,
- val, 0) != TX_SUCCESS)
+ if (val)
{
- // Could not change min channel timer.
- // Log error
- limLog(pMac, LOGP, FL("Unable to change periodic timer"));
+ if (tx_timer_change(&pMac->lim.limTimers.gLimPeriodicProbeReqTimer,
+ val, 0) != TX_SUCCESS)
+ {
+ // Could not change min channel timer.
+ // Log error
+ limLog(pMac, LOGP, FL("Unable to change periodic timer"));
+ }
+ }
+ else
+ {
+ limLog(pMac, LOGE, FL("Do not change gLimPeriodicProbeReqTimer values,"
+ "value = %d minchannel time = %d"
+ "maxchannel time = %d"), val,
+ pMac->lim.gpLimMlmScanReq->minChannelTime,
+ pMac->lim.gpLimMlmScanReq->maxChannelTime);
}
break;