diff options
| author | Varun Reddy Yeturu <vyeturu@qca.qualcomm.com> | 2015-06-08 16:17:03 -0700 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2015-06-22 20:50:24 +0530 |
| commit | 6ce17c821aada1bc03d08c61e2ab363fff853035 (patch) | |
| tree | 8e1b963171488cdc14ac5befb3799071ecf0904a | |
| parent | b349e7fdf4fca1d68cb9d53f6e772016e1fe364a (diff) | |
qcacld-2.0: Error handling in Roaming code #1
prima to qcacld-2.0 propagation
This fix contains following changes
1. Remove redundant memset and cleanup,
2. Populate proper length in Candidate Found Indication,
3. Provide proper length to copy the RIC IEs and
4. Allocate correct size for the message.
CRs-Fixed: 789742
Change-Id: I3d5295182916997955138fae021e2e257b2caccf
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_assoc.c | 2 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limFT.c | 2 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limSendSmeRspMessages.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index 6c30ca368875..b5293babef56 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -420,7 +420,7 @@ void hdd_SendFTEvent(hdd_adapter_t *pAdapter) vos_mem_zero(ricIe, DOT11F_IE_RICDESCRIPTOR_MAX_LEN); sme_GetRICIEs( pHddCtx->hHal, pAdapter->sessionId, (u8 *)ricIe, - DOT11F_IE_FTINFO_MAX_LEN, &ric_ies_length ); + DOT11F_IE_RICDESCRIPTOR_MAX_LEN, &ric_ies_length ); if (ric_ies_length == 0) { hddLog(LOGW, diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c index 6e6b7621d3f4..cb2e86edb365 100644 --- a/CORE/MAC/src/pe/lim/limFT.c +++ b/CORE/MAC/src/pe/lim/limFT.c @@ -296,7 +296,7 @@ int limProcessFTPreAuthReq(tpAniSirGlobal pMac, tpSirMsgQ pMsg) psessionEntry->ftPEContext.pFTPreAuthReq = ftPreAuthReq; #if defined WLAN_FEATURE_VOWIFI_11R_DEBUG - PELOGE(limLog( pMac, LOG1, FL("PE Auth ft_ies_length=%02x%02x%02x"), + PELOGE(limLog( pMac, LOG1, FL("PRE Auth ft_ies_length=%02x%02x%02x"), psessionEntry->ftPEContext.pFTPreAuthReq->ft_ies[0], psessionEntry->ftPEContext.pFTPreAuthReq->ft_ies[1], psessionEntry->ftPEContext.pFTPreAuthReq->ft_ies[2]);) diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c index f73fc67c04c5..59473b8f6e86 100644 --- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c +++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c @@ -3112,8 +3112,7 @@ limSendSmeCandidateFoundInd(tpAniSirGlobal pMac, tANI_U8 sessionId) pSirSmeCandidateFoundInd->messageType = eWNI_SME_CANDIDATE_FOUND_IND; pSirSmeCandidateFoundInd->length = sizeof(tSirSmeCandidateFoundInd); - - pSirSmeCandidateFoundInd->sessionId = sessionId; + pSirSmeCandidateFoundInd->sessionId = sessionId; limLog( pMac, LOG1, FL("posting candidate ind to SME")); |