From d80e9159e47ac991d81ff2e1d466def4b9b8b356 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 10 Jun 2018 16:35:43 -0700 Subject: [PATCH] qcacld-3.0: Fix csr_get_wapi_information() context param Currently csr_get_wapi_information() takes a tHalHandle context param. However this is a static function, and hence it should be using the "real" context pointer type tpAniSirGlobal instead of the opaque reference tHalHandle, so update the API to expect tpAniSirGlobal. Change-Id: I54004093c729add183fc3e02033d78f829f47241 CRs-Fixed: 2268179 --- core/sme/src/csr/csr_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 0498e3d4d819..891b696ad197 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -4078,7 +4078,7 @@ uint8_t csr_construct_rsn_ie(tpAniSirGlobal pMac, uint32_t sessionId, #ifdef FEATURE_WLAN_WAPI /** * csr_get_wapi_information() - to get WAPI information - * @hal: pointer to HAL + * @mac_ctx: pointer to global MAC context * @auth_type: auth type * @encr_type: encryption type * @mc_encryption: multicast encryption type @@ -4093,7 +4093,8 @@ uint8_t csr_construct_rsn_ie(tpAniSirGlobal pMac, uint32_t sessionId, * * Return: bool */ -static bool csr_get_wapi_information(tHalHandle hal, tCsrAuthList *auth_type, +static bool csr_get_wapi_information(tpAniSirGlobal mac_ctx, + tCsrAuthList *auth_type, eCsrEncryptionType encr_type, tCsrEncryptionList *mc_encryption, tDot11fIEWAPI *wapi_ie, @@ -4102,7 +4103,6 @@ static bool csr_get_wapi_information(tHalHandle hal, tCsrAuthList *auth_type, eCsrAuthType *negotiated_authtype, eCsrEncryptionType *negotiated_mccipher) { - tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); bool acceptable_cipher = false; uint8_t c_ucast_cipher = 0; uint8_t c_mcast_cipher = 0;