From 24dab280116d4fda90a0a6c7a15cb8219193fb55 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Fri, 4 Dec 2015 10:54:07 -0800 Subject: [PATCH] qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in sSirAddtsReq Replace tSirMacAddr with cdf_mac_addr in struct sSirAddtsReq. Change-Id: I9a9f4cfc2185859c30d56ec4bc98891c9895531d CRs-Fixed: 898864 --- core/mac/inc/sir_api.h | 2 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 5 ++--- core/sme/src/qos/sme_qos.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 8f5f48fd1c..cf32b59141 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1976,7 +1976,7 @@ typedef struct sSirAddtsReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; - tSirMacAddr bssId; /* BSSID */ + struct cdf_mac_addr bssid; /* BSSID */ uint32_t timeout; /* in ms */ uint8_t rspReqd; tSirAddtsReqInfo req; 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 7a4bcfe032..f1d42dcb5d 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 @@ -3713,9 +3713,8 @@ static void __lim_process_sme_addts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf) pSirAddts = (tpSirAddtsReq) pMsgBuf; - psessionEntry = pe_find_session_by_bssid(pMac, - pSirAddts->bssId, - &sessionId); + psessionEntry = pe_find_session_by_bssid(pMac, pSirAddts->bssid.bytes, + &sessionId); if (psessionEntry == NULL) { lim_log(pMac, LOGE, "Session Does not exist for given bssId"); return; diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c index a171e1f5f9..8372a1fa20 100644 --- a/core/sme/src/qos/sme_qos.c +++ b/core/sme/src/qos/sme_qos.c @@ -3965,7 +3965,7 @@ CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, cdf_mem_free(pMsg); return CDF_STATUS_E_FAILURE; } - cdf_mem_copy(&pMsg->bssId[0], + cdf_mem_copy(&pMsg->bssid.bytes[0], &pSession->assocInfo.pBssDesc->bssId[0], sizeof(struct cdf_mac_addr)); CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,