From 57d8ee8f236a993ddfd111ff92b95a3dbff8fe05 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Mon, 4 Jun 2018 06:25:32 -0700 Subject: [PATCH] qcacld-3.0: Fix csr_parse_bss_description_ies() context param Currently csr_parse_bss_description_ies() takes a tHalHandle context param. However CSR is an internal module, and hence it should be using the "real" context pointer type tpAniSirGlobal instead of the opaque reference tHalhandle, so update the API. Change-Id: Iabb093ac924340b0a6bfa5185d0b9d5fcc440c91 CRs-Fixed: 2255547 --- core/sme/inc/csr_support.h | 5 +++-- core/sme/src/csr/csr_util.c | 9 ++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index 2ac0c1a1d6a2..54e92463ea61 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -310,8 +310,9 @@ uint16_t csr_rates_find_best_rate(tSirMacRateSet *pSuppRates, tSirMacRateSet *pExtRates, tSirMacPropRateSet *pPropRates); tSirBssType csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype); /* Caller allocates memory for pIEStruct */ -QDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, - tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIEStruct); +QDF_STATUS csr_parse_bss_description_ies(tpAniSirGlobal mac_ctx, + tSirBssDescription *pBssDesc, + tDot11fBeaconIEs *pIEStruct); /* * This function will allocate memory for the parsed IEs to the caller. * Caller must free the memory. after it is done with the data only if diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index e03d86149d62..ef1727271ceb 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -1611,19 +1611,18 @@ eCsrMediaAccessType csr_get_qos_from_bss_desc(tpAniSirGlobal mac_ctx, } /* Caller allocates memory for pIEStruct */ -QDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, - tSirBssDescription *pBssDesc, - tDot11fBeaconIEs *pIEStruct) +QDF_STATUS csr_parse_bss_description_ies(tpAniSirGlobal mac_ctx, + tSirBssDescription *pBssDesc, + tDot11fBeaconIEs *pIEStruct) { QDF_STATUS status = QDF_STATUS_E_FAILURE; - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); int ieLen = (int)(pBssDesc->length + sizeof(pBssDesc->length) - GET_FIELD_OFFSET(tSirBssDescription, ieFields)); if (ieLen > 0 && pIEStruct) { if (!DOT11F_FAILED(dot11f_unpack_beacon_i_es - (pMac, (uint8_t *) pBssDesc->ieFields, + (mac_ctx, (uint8_t *) pBssDesc->ieFields, ieLen, pIEStruct, false))) status = QDF_STATUS_SUCCESS; }