From 999106b34da1e54fcea11522285f0e482e07f1b2 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 24 Sep 2015 15:12:09 -0700 Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirSmeApNewCaps Replace tSirMacAddr with cdf_mac_addr in sSirSmeApNewCaps. Change-Id: I785b2631e149e44835e2cf53d997673b9c5515c0 CRs-Fixed: 898864 --- core/mac/inc/sir_api.h | 2 +- core/mac/src/pe/lim/lim_api.c | 4 ++-- core/sme/src/csr/csr_api_roam.c | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 3eeffea51bbe..bc177b988882 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1135,7 +1135,7 @@ typedef struct sSirSmeNewBssInfo { typedef struct sSirSmeApNewCaps { uint16_t capabilityInfo; - tSirMacAddr bssId; + struct cdf_mac_addr bssId; uint8_t channelId; uint8_t reserved[3]; tSirMacSSid ssId; diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 761bc7e5cf2c..2ed29da641de 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -1587,8 +1587,8 @@ lim_detect_change_in_ap_capabilities(tpAniSirGlobal pMac, len = sizeof(tSirMacCapabilityInfo) + sizeof(tSirMacAddr) + sizeof(uint8_t) + 3 * sizeof(uint8_t) + /* reserved fields */ pBeacon->ssId.length + 1; - cdf_mem_copy(apNewCaps.bssId, - psessionEntry->bssId, sizeof(tSirMacAddr)); + cdf_mem_copy(apNewCaps.bssId.bytes, + psessionEntry->bssId, CDF_MAC_ADDR_SIZE); if (newChannel != psessionEntry->currentOperChannel) { PELOGE(lim_log (pMac, LOGE, diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 7789573af980..7fff5bf72698 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -9965,7 +9965,8 @@ void csr_send_ese_adjacent_ap_rep_ind(tpAniSirGlobal pMac, tCsrRoamSession *pSes } #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ -CDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, tSirMacAddr *bssId) +static CDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, + struct cdf_mac_addr *bssId) { tpSirResetAPCapsChange pMsg; uint16_t len; @@ -9982,7 +9983,7 @@ CDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, tSirMacAddr *bssI cdf_mem_set(pMsg, sizeof(tSirResetAPCapsChange), 0); pMsg->messageType = eWNI_SME_RESET_AP_CAPS_CHANGED; pMsg->length = len; - cdf_mem_copy(pMsg->bssId, bssId, sizeof(tSirMacAddr)); + cdf_mem_copy(pMsg->bssId, bssId->bytes, CDF_MAC_ADDR_SIZE); sms_log(pMac, LOG1, FL("CSR reset caps change for Bssid= " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pMsg->bssId)); @@ -10588,7 +10589,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, sms_log(mac_ctx, LOGW, FL("CSR handling eSIR_SME_AP_CAPS_CHANGED")); status = csr_roam_get_session_id_from_bssid(mac_ctx, - (struct cdf_mac_addr *)pApNewCaps->bssId, &sessionId); + &pApNewCaps->bssId, &sessionId); if (!CDF_IS_STATUS_SUCCESS(status)) break; if (eCSR_ROAMING_STATE_JOINED ==