From a6a191a2d79e17cc0c3e7a4285e8cd9cd8bbf3f9 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 3 Jun 2018 19:25:33 -0700 Subject: [PATCH] qcacld-3.0: Fix csr_construct_wpa_ie() context param Currently csr_construct_wpa_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: Id690878208d1e5ca97adfce94a61629a8788ede2 CRs-Fixed: 2255547 --- core/sme/inc/csr_support.h | 3 ++- core/sme/src/csr/csr_util.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index be33e80c38be..3c360c8b88a4 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -236,7 +236,8 @@ uint8_t csr_construct_rsn_ie(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrRSNIe *pRSNIe); -uint8_t csr_construct_wpa_ie(tHalHandle hHal, struct csr_roam_profile *pProfile, +uint8_t csr_construct_wpa_ie(tpAniSirGlobal pMac, + struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe); diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 9480cac72996..63cce5159f75 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -4544,11 +4544,11 @@ static bool csr_is_wpa_encryption_match(tpAniSirGlobal pMac, return fWpaMatch; } -uint8_t csr_construct_wpa_ie(tHalHandle hHal, struct csr_roam_profile *pProfile, +uint8_t csr_construct_wpa_ie(tpAniSirGlobal pMac, + struct csr_roam_profile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrWpaIe *pWpaIe) { - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); bool fWpaMatch; uint8_t cbWpaIe = 0; uint8_t UnicastCypher[CSR_WPA_OUI_SIZE]; @@ -4571,7 +4571,7 @@ uint8_t csr_construct_wpa_ie(tHalHandle hHal, struct csr_roam_profile *pProfile, * settings in the profile. */ fWpaMatch = - csr_get_wpa_cyphers(hHal, &pProfile->AuthType, + csr_get_wpa_cyphers(pMac, &pProfile->AuthType, pProfile->negotiatedUCEncryptionType, &pProfile->mcEncryptionType, &pIesLocal->WPA, UnicastCypher,