From ed463e155c663c748c4bceddfbf435da4c03bbeb Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 3 Jun 2018 21:33:33 -0700 Subject: [PATCH] qcacld-3.0: Fix csr_rates_is_dot11_rate_supported() context param Currently csr_rates_is_dot11_rate_supported() 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: I9349e152b4818862f7ac406f7a8f96d78c4c1782 CRs-Fixed: 2255547 --- core/sme/inc/csr_support.h | 2 +- core/sme/src/csr/csr_util.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index 3b21508712bd..2ac0c1a1d6a2 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -305,7 +305,7 @@ bool csr_is_bssid_match(struct qdf_mac_addr *pProfBssid, struct qdf_mac_addr *BssBssid); void csr_add_rate_bitmap(uint8_t rate, uint16_t *pRateBitmap); bool csr_check_rate_bitmap(uint8_t rate, uint16_t RateBitmap); -bool csr_rates_is_dot11_rate_supported(tHalHandle hHal, uint8_t rate); +bool csr_rates_is_dot11_rate_supported(tpAniSirGlobal mac_ctx, uint8_t rate); uint16_t csr_rates_find_best_rate(tSirMacRateSet *pSuppRates, tSirMacRateSet *pExtRates, tSirMacPropRateSet *pPropRates); tSirBssType csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype); diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 9b2e71f8c4d0..e03d86149d62 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -5634,12 +5634,11 @@ bool csr_check_rate_bitmap(uint8_t rate, uint16_t rateBitmap) return !!rateBitmap; } -bool csr_rates_is_dot11_rate_supported(tHalHandle hHal, uint8_t rate) +bool csr_rates_is_dot11_rate_supported(tpAniSirGlobal mac_ctx, uint8_t rate) { - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint16_t n = BITS_OFF(rate, CSR_DOT11_BASIC_RATE_MASK); - return csr_is_aggregate_rate_supported(pMac, n); + return csr_is_aggregate_rate_supported(mac_ctx, n); } static uint16_t csr_rates_mac_prop_to_dot11(uint16_t Rate)