From cd88e7602a222fee18132160c6c0cbd290997c08 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Mon, 4 Jan 2016 16:17:15 -0800 Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirSmeDeauthRsp Replace tSirMacAddr with cdf_mac_addr in tSirSmeDeauthRsp. Change-Id: I383f867f8847f66bc6f6e99ee2a56b4bc89ebe5b CRs-Fixed: 898864 --- core/mac/inc/sir_api.h | 2 +- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 4 ++-- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 2 +- core/sme/src/csr/csr_api_roam.c | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index a1328bda37..8fe8961352 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1425,7 +1425,7 @@ typedef struct sSirSmeDeauthRsp { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ tSirResultCodes statusCode; - tSirMacAddr peerMacAddr; + struct cdf_mac_addr peer_macaddr; } tSirSmeDeauthRsp, *tpSirSmeDeauthRsp; /* / Definition for Deauthetication indication from peer */ diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index dc89b0918a..949b44ced9 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -2010,9 +2010,9 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, mlm_deauth_req->sessionId; sme_deauth_rsp->transactionId = 0; - cdf_mem_copy(sme_deauth_rsp->peerMacAddr, + cdf_mem_copy(sme_deauth_rsp->peer_macaddr.bytes, mlm_deauth_req->peerMacAddr, - sizeof(tSirMacAddr)); + CDF_MAC_ADDR_SIZE); msg_buf = (uint32_t *)sme_deauth_rsp; diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 54580f82e2..96af67bf1b 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -1401,7 +1401,7 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, pSirSmeDeauthRsp->sessionId = smesessionId; pSirSmeDeauthRsp->transactionId = smetransactionId; - pBuf = (uint8_t *) pSirSmeDeauthRsp->peerMacAddr; + pBuf = (uint8_t *) pSirSmeDeauthRsp->peer_macaddr.bytes; cdf_mem_copy(pBuf, peerMacAddr, sizeof(tSirMacAddr)); #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 7b5769bff1..8415a89fc4 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -10302,9 +10302,8 @@ csr_roam_chk_lnk_deauth_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) if (CSR_IS_INFRA_AP(&session->connectedProfile)) { roam_info_ptr = &roam_info; roam_info_ptr->u.pConnectedProfile = &session->connectedProfile; - cdf_mem_copy(roam_info_ptr->peerMac.bytes, - pDeauthRsp->peerMacAddr, - sizeof(tSirMacAddr)); + cdf_copy_macaddr(&roam_info_ptr->peerMac, + &pDeauthRsp->peer_macaddr); roam_info_ptr->reasonCode = eCSR_ROAM_RESULT_FORCED; roam_info_ptr->statusCode = pDeauthRsp->statusCode; status = csr_roam_call_callback(mac_ctx, sessionId,