From 40567b94a12d8450d9c2fe14df03e03f337e3ea4 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 24 Sep 2015 15:17:25 -0700 Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirResetAPCapsChange Replace tSirMacAddr with cdf_mac_addr in sSirResetAPCapsChange. Change-Id: Ife3e49f1902baafaddf5f304dd423451319f2783 CRs-Fixed: 898864 --- core/mac/inc/sir_api.h | 2 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 3 ++- core/sme/src/csr/csr_api_roam.c | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index bc177b988882..15e727dd954c 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -3463,7 +3463,7 @@ typedef struct sSirActiveModeSetBcnFilterReq { typedef struct sSirResetAPCapsChange { uint16_t messageType; uint16_t length; - tSirMacAddr bssId; + struct cdf_mac_addr bssId; } tSirResetAPCapsChange, *tpSirResetAPCapsChange; /* / Definition for Candidate found indication from FW */ diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 764432accafc..9a02530c3044 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -4735,7 +4735,8 @@ __lim_process_sme_reset_ap_caps_change(tpAniSirGlobal pMac, uint32_t *pMsgBuf) pResetCapsChange = (tpSirResetAPCapsChange) pMsgBuf; psessionEntry = - pe_find_session_by_bssid(pMac, pResetCapsChange->bssId, &sessionId); + pe_find_session_by_bssid(pMac, pResetCapsChange->bssId.bytes, + &sessionId); if (psessionEntry == NULL) { lim_log(pMac, LOGE, FL("Session does not exist for given BSSID")); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 7fff5bf72698..0d93d573c088 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -9979,17 +9979,18 @@ static CDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, status = CDF_STATUS_E_NOMEM; else status = CDF_STATUS_SUCCESS; + if (CDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(pMsg, sizeof(tSirResetAPCapsChange), 0); pMsg->messageType = eWNI_SME_RESET_AP_CAPS_CHANGED; pMsg->length = len; - cdf_mem_copy(pMsg->bssId, bssId->bytes, CDF_MAC_ADDR_SIZE); + cdf_copy_macaddr(&pMsg->bssId, bssId); sms_log(pMac, LOG1, FL("CSR reset caps change for Bssid= " MAC_ADDRESS_STR), - MAC_ADDR_ARRAY(pMsg->bssId)); + MAC_ADDR_ARRAY(pMsg->bssId.bytes)); status = cds_send_mb_message_to_mac(pMsg); } else { - sms_log(pMac, LOGE, FL("Memory allocation failed\n")); + sms_log(pMac, LOGE, FL("Memory allocation failed")); } return status; }