From 353650ea7106aa977d2e5af90f132d68bd13fbfe Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 10 Jun 2018 16:29:42 -0700 Subject: [PATCH] qcacld-3.0: Fix csr_get_rsn_information() context param Currently csr_get_rsn_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: I29ad553360eddcf2b990b83bb0d1418d744a85ec CRs-Fixed: 2268178 --- 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 eab7cc07aaf3..0498e3d4d819 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -3339,7 +3339,7 @@ static void csr_check_sae_auth(tpAniSirGlobal mac_ctx, /** * csr_get_rsn_information() - to get RSN 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 @@ -3357,7 +3357,8 @@ static void csr_check_sae_auth(tpAniSirGlobal mac_ctx, * * Return: bool */ -static bool csr_get_rsn_information(tHalHandle hal, tCsrAuthList *auth_type, +static bool csr_get_rsn_information(tpAniSirGlobal mac_ctx, + tCsrAuthList *auth_type, eCsrEncryptionType encr_type, tCsrEncryptionList *mc_encryption, tDot11fIERSN *rsn_ie, uint8_t *ucast_cipher, @@ -3368,7 +3369,6 @@ static bool csr_get_rsn_information(tHalHandle hal, tCsrAuthList *auth_type, uint8_t *gp_mgmt_cipher, tAniEdType *mgmt_encryption_type) { - tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); bool acceptable_cipher = false; bool group_mgmt_acceptable_cipher = false; uint8_t c_ucast_cipher = 0;