From 05123e50519747d9f689ae539372c2509e7b2d5c Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 25 Nov 2015 12:42:32 -0800 Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in tSmeCsaOffloadInd Replace tSirMacAddr with cdf_mac_addr in tSmeCsaOffloadInd. Change-Id: Iaf4357b2da216d9f11ca35331d45bff5193a2ee9 CRs-Fixed: 898864 --- core/mac/inc/sir_api.h | 2 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 6 +++--- core/sme/src/csr/csr_api_scan.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 5c64544510..6e0656add8 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -2144,7 +2144,7 @@ typedef struct sSmeMaxAssocInd { typedef struct sSmeCsaOffloadInd { uint16_t mesgType; /* eWNI_SME_CSA_OFFLOAD_EVENT */ uint16_t mesgLen; - tSirMacAddr bssId; /* BSSID */ + struct cdf_mac_addr bssid; /* BSSID */ } tSmeCsaOffloadInd, *tpSmeCsaOffloadInd; /* WOW related structures */ 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 470f11958e..ec18e49165 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 @@ -2212,13 +2212,13 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) cdf_mem_set(csa_offload_ind, sizeof(tSmeCsaOffloadInd), 0); csa_offload_ind->mesgType = eWNI_SME_CSA_OFFLOAD_EVENT; csa_offload_ind->mesgLen = sizeof(tSmeCsaOffloadInd); - cdf_mem_copy(csa_offload_ind->bssId, session_entry->bssId, - sizeof(tSirMacAddr)); + cdf_mem_copy(csa_offload_ind->bssid.bytes, session_entry->bssId, + CDF_MAC_ADDR_SIZE); mmh_msg.type = eWNI_SME_CSA_OFFLOAD_EVENT; mmh_msg.bodyptr = csa_offload_ind; mmh_msg.bodyval = 0; lim_log(mac_ctx, LOG1, - FL("Sending eWNI_SME_CSA_OFFLOAD_EVENT to SME. ")); + FL("Sending eWNI_SME_CSA_OFFLOAD_EVENT to SME.")); MTRACE(mac_trace_msg_tx (mac_ctx, session_entry->peSessionId, mmh_msg.type)); #ifdef FEATURE_WLAN_DIAG_SUPPORT diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 66f4609fc5..93866115f0 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -2162,13 +2162,13 @@ void csr_scan_flush_bss_entry(tpAniSirGlobal pMac, while (pEntry != NULL) { pBssDesc = GET_BASE_ADDR(pEntry, tCsrScanResult, Link); if (cdf_mem_compare(pBssDesc->Result.BssDescriptor.bssId, - pCsaOffloadInd->bssId, sizeof(tSirMacAddr))) { + pCsaOffloadInd->bssid.bytes, CDF_MAC_ADDR_SIZE)) { pFreeElem = pEntry; pEntry = csr_ll_next(pList, pEntry, LL_ACCESS_NOLOCK); csr_ll_remove_entry(pList, pFreeElem, LL_ACCESS_NOLOCK); csr_free_scan_result_entry(pMac, pBssDesc); sms_log(pMac, LOG1, FL("Removed BSS entry:%pM"), - pCsaOffloadInd->bssId); + pCsaOffloadInd->bssid.bytes); continue; }