From c27696290d06cee6951560e990b243c3e6feaa4a Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 3 Jun 2018 21:14:25 -0700 Subject: [PATCH] qcacld-3.0: Fix csr_retrieve_wapi_ie() context param Currently csr_retrieve_wapi_ie() 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: I0dca1d6b64e3ef3698439277d05611d7051926c2 CRs-Fixed: 2255547 --- core/sme/inc/csr_support.h | 8 ++++---- core/sme/src/csr/csr_util.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index 1edd61e9d296..c0b50b1d3d5a 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -278,10 +278,10 @@ uint8_t csr_retrieve_rsn_ie(tpAniSirGlobal pMac, uint32_t sessionId, * Or else construct one from the BSS. Caller allocated memory for pWapiIe and * guarrantee it can contain a max length WAPI IE */ -uint8_t csr_retrieve_wapi_ie(tHalHandle hHal, uint32_t sessionId, - struct csr_roam_profile *pProfile, - tSirBssDescription *pSirBssDesc, - tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe); +uint8_t csr_retrieve_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, + struct csr_roam_profile *pProfile, + tSirBssDescription *pSirBssDesc, + tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe); #endif /* FEATURE_WLAN_WAPI */ bool csr_rates_is_dot11_rate11b_supported_rate(uint8_t dot11Rate); bool csr_rates_is_dot11_rate11a_supported_rate(uint8_t dot11Rate); diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 083867435f99..b27735f949a5 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -4720,12 +4720,11 @@ uint8_t csr_retrieve_rsn_ie(tpAniSirGlobal pMac, uint32_t sessionId, * one from the BSS Caller allocated memory for pWapiIe and guarrantee * it can contain a max length WAPI IE */ -uint8_t csr_retrieve_wapi_ie(tHalHandle hHal, uint32_t sessionId, +uint8_t csr_retrieve_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe) { - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t cbWapiIe = 0; do {