From 591c56501c3bf236ecefdf67060cbc92095907d8 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 30 Dec 2015 17:39:50 -0800 Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSirSmeSwitchChannelInd Replace tSirMacAddr with cdf_mac_addr in tSirSmeSwitchChannelInd. Change-Id: Ide9e600c1c4b105740bd16a13366e1e2f5f9fda6 CRs-Fixed: 898864 --- core/mac/inc/sir_api.h | 2 +- core/mac/src/pe/lim/lim_utils.c | 4 ++-- core/sme/src/csr/csr_api_roam.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 68bc6ff9c0ef..431a71ec7e3a 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1469,7 +1469,7 @@ typedef struct sSirSmeSwitchChannelInd { uint16_t length; uint8_t sessionId; uint16_t newChannelId; - tSirMacAddr bssId; /* BSSID */ + struct cdf_mac_addr bssid; /* BSSID */ } tSirSmeSwitchChannelInd, *tpSirSmeSwitchChannelInd; /* / Definition for Neighbor BSS indication */ diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 0b90d19ad229..41801aa1bbf0 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -2683,8 +2683,8 @@ void lim_switch_channel_cback(tpAniSirGlobal pMac, CDF_STATUS status, pSirSmeSwitchChInd->newChannelId = psessionEntry->gLimChannelSwitch.primaryChannel; pSirSmeSwitchChInd->sessionId = psessionEntry->smeSessionId; - cdf_mem_copy(pSirSmeSwitchChInd->bssId, psessionEntry->bssId, - sizeof(tSirMacAddr)); + cdf_mem_copy(pSirSmeSwitchChInd->bssid.bytes, psessionEntry->bssId, + CDF_MAC_ADDR_SIZE); mmhMsg.bodyptr = pSirSmeSwitchChInd; mmhMsg.bodyval = 0; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index a605be0f71b3..7fa928825265 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -10268,7 +10268,7 @@ csr_roam_chk_lnk_swt_ch_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) * statusCode. */ status = csr_roam_get_session_id_from_bssid(mac_ctx, - (struct cdf_mac_addr *) pSwitchChnInd->bssId, &sessionId); + &pSwitchChnInd->bssid, &sessionId); if (CDF_IS_STATUS_SUCCESS(status)) { session = CSR_GET_SESSION(mac_ctx, sessionId); if (!session) {