From cb2193a50dc29c5c211797f704a87f0342a9b872 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 3 Jun 2018 17:06:41 -0700 Subject: [PATCH] qcacld-3.0: Fix csr_get_frag_thresh() context param Currently csr_get_frag_thresh() 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: I69ae6f07dd12cf79659c5e4c461fba1c7fa8ff46 CRs-Fixed: 2255547 --- core/sme/inc/csr_support.h | 2 +- core/sme/src/csr/csr_util.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index ea2b3df03f..ef75fd3ce9 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -226,7 +226,7 @@ bool csr_is_privacy(tSirBssDescription *pSirBssDesc); tSirResultCodes csr_get_disassoc_rsp_status_code(tSirSmeDisassocRsp * pSmeDisassocRsp); tSirResultCodes csr_get_de_auth_rsp_status_code(tSirSmeDeauthRsp *pSmeRsp); -uint32_t csr_get_frag_thresh(tHalHandle hHal); +uint32_t csr_get_frag_thresh(tpAniSirGlobal mac_ctx); uint32_t csr_get_rts_thresh(tHalHandle hHal); eCsrPhyMode csr_get_phy_mode_from_bssDesc(tSirBssDescription *pSirBssDesc); uint32_t csr_get11h_power_constraint(tHalHandle hHal, diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 89d093bafc..f134a6e8dd 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -1698,11 +1698,9 @@ bool csr_is_nullssid(uint8_t *pBssSsid, uint8_t len) return fNullSsid; } -uint32_t csr_get_frag_thresh(tHalHandle hHal) +uint32_t csr_get_frag_thresh(tpAniSirGlobal mac_ctx) { - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - - return pMac->roam.configParam.FragmentationThreshold; + return mac_ctx->roam.configParam.FragmentationThreshold; } uint32_t csr_get_rts_thresh(tHalHandle hHal)