summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCNSS_WLAN Service <cnssbldsw@qualcomm.com>2019-04-15 09:18:46 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2019-04-15 09:18:46 -0700
commit87cb45fe5b0769f462d24d663fe0ea89048f9393 (patch)
treed56ca82ea0e355d51c18fc854ecae121e0264ec3
parent51fd4c2bbb2c3ce1e5e04de07bcbdb8f6f89a0d7 (diff)
parentf2aa245a1582ba72cf1f1bb0830de7b0d8a12dd4 (diff)
Merge "qcacld-2.0: Add coverity change" into wlan-cld2.driver.lnx.1.0
-rw-r--r--CORE/MAC/src/pe/lim/limTimerUtils.c3
-rw-r--r--CORE/SME/src/csr/csrApiRoam.c8
2 files changed, 8 insertions, 3 deletions
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index d6180093916c..73131b4177d7 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -159,7 +159,8 @@ limCreateTimers(tpAniSirGlobal pMac)
cfgValue = SYS_MS_TO_TICKS(cfgValue);
/* Limiting max number of probe req for each channel scan */
- pMac->lim.maxProbe = (cfgValue/cfgValue1);
+ if (cfgValue1)
+ pMac->lim.maxProbe = (cfgValue/cfgValue1);
if (tx_timer_create(&pMac->lim.limTimers.gLimMaxChannelTimer,
"MAX CHANNEL TIMEOUT",
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 3f9c721fca22..78edfc28d689 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -11496,10 +11496,14 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg )
}
if(!HAL_STATUS_SUCCESS(status))
{
- if(pRoamInfo->pbFrames)
+ if(pRoamInfo->pbFrames) {
vos_mem_free(pRoamInfo->pbFrames);
- if(pRoamInfo->pBssDesc)
+ pRoamInfo->pbFrames = NULL;
+ }
+ if(pRoamInfo->pBssDesc) {
vos_mem_free(pRoamInfo->pBssDesc);
+ pRoamInfo->pBssDesc = NULL;
+ }
}
}
if ((eCSR_ENCRYPT_TYPE_NONE ==