A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Fix csr_construct_wpa_ie() context param

Browse source 
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
This commit is contained in:
Jeff Johnson 2018-06-03 19:25:33 -07:00
commit a6a191a2d7
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/sme/inc/csr_support.h
View file

@ -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);

6
core/sme/src/csr/csr_util.c
View file

@ -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,