From 37c133b074be0f6449d46661afa303198bbc844b Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 24 Sep 2015 16:14:15 -0700 Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirSmeMicFailureInd Replace tSirMacAddr with cdf_mac_addr in sSirSmeMicFailureInd. Change-Id: I65371e094fc8fb02a400960aca192b5bf7034413 CRs-Fixed: 898864 --- core/mac/inc/sir_api.h | 2 +- core/sme/src/csr/csr_api_roam.c | 2 +- core/wma/src/wma_data.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 177290de5e80..d3309e5090bb 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1441,7 +1441,7 @@ typedef struct sSirSmeMicFailureInd { uint16_t messageType; /* eWNI_SME_MIC_FAILURE_IND */ uint16_t length; uint8_t sessionId; - tSirMacAddr bssId; /* BSSID */ + struct cdf_mac_addr bssId; tSirMicFailureInfo info; } tSirSmeMicFailureInd, *tpSirSmeMicFailureInd; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 9cc469da3366..35a9fca59d43 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -10437,7 +10437,7 @@ csr_roam_chk_lnk_mic_fail_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) cdf_mem_set(&roam_info, sizeof(roam_info), 0); status = csr_roam_get_session_id_from_bssid(mac_ctx, - (struct cdf_mac_addr *) pMicInd->bssId, &sessionId); + &pMicInd->bssId, &sessionId); if (CDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); roam_info.u.pMICFailureInfo = &pMicInd->info; diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 7e2cafbd86d3..d334879cad0c 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -2922,9 +2922,8 @@ void ol_rx_err(ol_pdev_handle pdev, uint8_t vdev_id, mic_err_ind->messageType = eWNI_SME_MIC_FAILURE_IND; mic_err_ind->length = sizeof(*mic_err_ind); mic_err_ind->sessionId = vdev_id; - cdf_mem_copy(mic_err_ind->bssId, - (struct cdf_mac_addr *) wma->interfaces[vdev_id].bssid, - sizeof(tSirMacAddr)); + cdf_copy_macaddr(&mic_err_ind->bssId, + (struct cdf_mac_addr *) &wma->interfaces[vdev_id].bssid); cdf_mem_copy(mic_err_ind->info.taMacAddr, (struct cdf_mac_addr *) peer_mac_addr, sizeof(tSirMacAddr));