From c8f9b6789b02db584954307e8a8a2d35e69b4fac Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 3 Jun 2018 20:56:41 -0700 Subject: [PATCH] qcacld-3.0: Fix csr_retrieve_rsn_ie() context param Currently csr_retrieve_rsn_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: Ie410ef70ed38c569f1203f59a4fc8ce4ee30400d CRs-Fixed: 2255547 --- core/sme/inc/csr_support.h | 10 +++++----- core/sme/src/csr/csr_util.c | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index 1e9721cb2912..1edd61e9d296 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -266,12 +266,12 @@ bool csr_is_profile_rsn(struct csr_roam_profile *pProfile); /* * If a RSNIE exists in the profile, just use it. Or * else construct one from the BSS Caller allocated memory for pWpaIe and - * guarrantee it can contain a max length WPA IE + * guarantee it can contain a max length WPA IE */ -uint8_t csr_retrieve_rsn_ie(tHalHandle hHal, uint32_t sessionId, - struct csr_roam_profile *pProfile, - tSirBssDescription *pSirBssDesc, - tDot11fBeaconIEs *pIes, tCsrRSNIe *pRsnIe); +uint8_t csr_retrieve_rsn_ie(tpAniSirGlobal pMac, uint32_t sessionId, + struct csr_roam_profile *pProfile, + tSirBssDescription *pSirBssDesc, + tDot11fBeaconIEs *pIes, tCsrRSNIe *pRsnIe); #ifdef FEATURE_WLAN_WAPI /* * If a WAPI IE exists in the profile, just use it. diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 3deeecb537ed..083867435f99 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -4662,12 +4662,11 @@ uint8_t csr_retrieve_wpa_ie(tpAniSirGlobal pMac, * one from the BSS Caller allocated memory for pWpaIe and guarrantee * it can contain a max length WPA IE */ -uint8_t csr_retrieve_rsn_ie(tHalHandle hHal, uint32_t sessionId, +uint8_t csr_retrieve_rsn_ie(tpAniSirGlobal pMac, uint32_t sessionId, struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrRSNIe *pRsnIe) { - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t cbRsnIe = 0; do {