From 743205e1fa5709ba7ef43c2a268f67caa1a8ce11 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 24 Sep 2015 10:58:51 -0700 Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirRemainOnChnReq Replace tSirMacAddr with cdf_mac_addr in sSirRemainOnChnReq. Change-Id: I75594fc51ae1a82ef08b3e0b43c2a8733387b9af CRs-Fixed: 898864 --- core/mac/inc/sir_api.h | 2 +- core/mac/src/pe/lim/lim_p2p.c | 6 +++--- core/sme/src/p2p/p2p_api.c | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 3fc95da65826..72f993d1957f 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -370,7 +370,7 @@ typedef struct sSirRemainOnChnReq { uint16_t messageType; uint16_t length; uint8_t sessionId; - tSirMacAddr selfMacAddr; + struct cdf_mac_addr selfMacAddr; uint8_t chnNum; uint8_t phyMode; uint32_t duration; diff --git a/core/mac/src/pe/lim/lim_p2p.c b/core/mac/src/pe/lim/lim_p2p.c index 7f29157ddfcd..1bd354293c53 100644 --- a/core/mac/src/pe/lim/lim_p2p.c +++ b/core/mac/src/pe/lim/lim_p2p.c @@ -101,8 +101,8 @@ static CDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac, msg.bodyval = 0; cdf_mem_copy((uint8_t *) pScanOffloadReq->selfMacAddr, - (uint8_t *) pRemOnChnReq->selfMacAddr, - sizeof(tSirMacAddr)); + (uint8_t *) pRemOnChnReq->selfMacAddr.bytes, + CDF_MAC_ADDR_SIZE); cdf_mem_copy((uint8_t *) pScanOffloadReq->bssId, (uint8_t *) bssid, sizeof(tSirMacAddr)); @@ -347,7 +347,7 @@ void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, CDF_STATUS status, uint32_t *dat /* delete the session */ if ((psessionEntry = pe_find_session_by_bssid(pMac, MsgRemainonChannel-> - selfMacAddr, + selfMacAddr.bytes, &sessionId)) != NULL) { if (LIM_IS_P2P_DEVICE_ROLE(psessionEntry)) { pe_delete_session(pMac, psessionEntry); diff --git a/core/sme/src/p2p/p2p_api.c b/core/sme/src/p2p/p2p_api.c index ec8b742263c8..36c17d435651 100644 --- a/core/sme/src/p2p/p2p_api.c +++ b/core/sme/src/p2p/p2p_api.c @@ -79,8 +79,7 @@ CDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, cdf_mem_set(pMsg, sizeof(tSirRemainOnChnReq), 0); pMsg->messageType = eWNI_SME_REMAIN_ON_CHANNEL_REQ; pMsg->length = (uint16_t) len; - cdf_mem_copy(pMsg->selfMacAddr, pSession->selfMacAddr.bytes, - sizeof(tSirMacAddr)); + cdf_copy_macaddr(&pMsg->selfMacAddr, &pSession->selfMacAddr); pMsg->chnNum = p2pRemainonChn->u.remainChlCmd.chn; pMsg->phyMode = p2pRemainonChn->u.remainChlCmd.phyMode; pMsg->duration = p2pRemainonChn->u.remainChlCmd.duration;