qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirUpdateAPWPSIEsReq

Replace tSirMacAddr with cdf_mac_addr in tSirUpdateAPWPSIEsReq.

Change-Id: Ia6d8ea2523257caac541c84d10b7e6a81afc606b
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda
2015-11-25 12:18:44 -08:00
committed by Akash Patel
parent 2087d8cb3e
commit c250b07891
3 changed files with 15 additions and 18 deletions

View File

@@ -2446,7 +2446,7 @@ typedef struct sSirUpdateAPWPSIEsReq {
uint16_t messageType; /* eWNI_SME_UPDATE_APWPSIE_REQ */ uint16_t messageType; /* eWNI_SME_UPDATE_APWPSIE_REQ */
uint16_t length; uint16_t length;
uint16_t transactionId; /* Transaction ID for cmd */ uint16_t transactionId; /* Transaction ID for cmd */
tSirMacAddr bssId; /* BSSID */ struct cdf_mac_addr bssid; /* BSSID */
uint8_t sessionId; /* Session ID */ uint8_t sessionId; /* Session ID */
tSirAPWPSIEs APWPSIEs; tSirAPWPSIEs APWPSIEs;
} tSirUpdateAPWPSIEsReq, *tpSirUpdateAPWPSIEsReq; } tSirUpdateAPWPSIEsReq, *tpSirUpdateAPWPSIEsReq;

View File

@@ -4106,7 +4106,7 @@ __lim_process_sme_update_apwpsi_es(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
sizeof(struct sSirUpdateAPWPSIEsReq)); sizeof(struct sSirUpdateAPWPSIEsReq));
psessionEntry = pe_find_session_by_bssid(pMac, psessionEntry = pe_find_session_by_bssid(pMac,
pUpdateAPWPSIEsReq->bssId, pUpdateAPWPSIEsReq->bssid.bytes,
&sessionId); &sessionId);
if (psessionEntry == NULL) { if (psessionEntry == NULL) {
lim_log(pMac, LOGW, lim_log(pMac, LOGW,

View File

@@ -17603,26 +17603,23 @@ CDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId,
tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
if (NULL == pSession) { if (NULL == pSession) {
sms_log(pMac, LOGE, sms_log(pMac, LOGE,
FL(" Session does not exist for session id %d"), FL("Session does not exist for session id %d"),
sessionId); sessionId);
return CDF_STATUS_E_FAILURE; return CDF_STATUS_E_FAILURE;
} }
do { pMsg = cdf_mem_malloc(sizeof(*pMsg));
pMsg = cdf_mem_malloc(sizeof(tSirUpdateAPWPSIEsReq)); if (NULL == pMsg)
if (NULL == pMsg) return CDF_STATUS_E_NOMEM;
return CDF_STATUS_E_NOMEM;
cdf_mem_set(pMsg, sizeof(tSirUpdateAPWPSIEsReq), 0); pMsg->messageType = eWNI_SME_UPDATE_APWPSIE_REQ;
pMsg->messageType = eWNI_SME_UPDATE_APWPSIE_REQ; pMsg->transactionId = 0;
pMsg->transactionId = 0; cdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr);
cdf_mem_copy(pMsg->bssId, &pSession->selfMacAddr, pMsg->sessionId = sessionId;
sizeof(tSirMacAddr)); cdf_mem_copy(&pMsg->APWPSIEs, pAPWPSIES, sizeof(tSirAPWPSIEs));
pMsg->sessionId = sessionId; pMsg->length = sizeof(*pMsg);
cdf_mem_copy(&pMsg->APWPSIEs, pAPWPSIES, status = cds_send_mb_message_to_mac(pMsg);
sizeof(tSirAPWPSIEs));
pMsg->length = sizeof(struct sSirUpdateAPWPSIEsReq);
status = cds_send_mb_message_to_mac(pMsg);
} while (0);
return status; return status;
} }