diff options
| author | Raja Mani <rmani@qti.qualcomm.com> | 2014-01-27 10:40:52 +0530 |
|---|---|---|
| committer | Prakash Dhavali <pdhavali@qca.qualcomm.com> | 2014-01-28 00:00:55 -0800 |
| commit | 7d0309f3864f3ecb22bd49f2bc5a4a65cab981a7 (patch) | |
| tree | ab7c579983a4941305bdf5ce4dee53125afdbe22 | |
| parent | c1554fe0e4632c4a2dc74e1d2a8274dc93f467c7 (diff) | |
qcacld: sme: Fix regression in csrRoamCallCallback()
The commit "wlan: Fix for Statis analysis errors in SME module" added
NULL check for pRoamInfo in csrRoamCallCallback() along with assert
to fix Klockwork defect. There are quite few places in CSR module
explicitly passes NULL for pRoamInfo (eCsrForcedDisassoc, etc) and
expects csrRoamCallCallback() to handle it gracefully.
Change-Id: I15b92930590276d8409a830fe9e0e9f56486c4dc
CRs-Fixed: 607486
| -rw-r--r-- | CORE/SME/src/csr/csrApiRoam.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index 2c4b7559dafa..64fcbc431b83 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -2438,15 +2438,10 @@ eHalStatus csrRoamCallCallback(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoam smsLog(pMac, LOG1, "%s Session is not Active", __func__); return eHAL_STATUS_FAILURE; } - if (NULL == pRoamInfo) - { - smsLog(pMac, LOGE, "%s: pRoamInfo is NULL", __func__); - VOS_ASSERT(0); - return eHAL_STATUS_FAILURE; - } + smsLog(pMac, LOG4, "Recieved RoamCmdStatus %d with Roam Result %d", u1, u2); - if(eCSR_ROAM_ASSOCIATION_COMPLETION == u1) + if(eCSR_ROAM_ASSOCIATION_COMPLETION == u1 && pRoamInfo) { smsLog(pMac, LOGW, " Assoc complete result = %d statusCode = %d reasonCode = %d", u2, pRoamInfo->statusCode, pRoamInfo->reasonCode); } @@ -2487,7 +2482,7 @@ eHalStatus csrRoamCallCallback(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoam vos_mem_set(&connectionStatus, sizeof(vos_event_wlan_status_payload_type), 0); - if((eCSR_ROAM_ASSOCIATION_COMPLETION == u1) && (eCSR_ROAM_RESULT_ASSOCIATED == u2)) + if((eCSR_ROAM_ASSOCIATION_COMPLETION == u1) && (eCSR_ROAM_RESULT_ASSOCIATED == u2) && pRoamInfo) { connectionStatus.eventId = eCSR_WLAN_STATUS_CONNECT; connectionStatus.bssType = pRoamInfo->u.pConnectedProfile->BSSType; |