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 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Use intersection of AP's and user's RSN cap in assoc req

Browse source 
While preparing the RSNIE caps only AP capability are considered.
The capability should be intersection of user provided capability
and AP's capability.

So use intersection of AP's and user's RSN cap in assoc request

Change-Id: I585d84953767c217239eedc284d6b413cf7af5e4
CRs-Fixed: 2164525
This commit is contained in:
Abhishek Singh 2017-12-20 11:02:34 +05:30 • committed by snandini
commit ed55b24b9e
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@ -3869,6 +3869,7 @@ uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId,
#endif
tDot11fBeaconIEs *pIesLocal = pIes;
eCsrAuthType negAuthType = eCSR_AUTH_TYPE_UNKNOWN;
tDot11fIERSN rsn_ie;
qdf_mem_zero(&pmkid_cache, sizeof(pmkid_cache));
do {
@ -3882,6 +3883,19 @@ uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId,
(pMac, pSirBssDesc, &pIesLocal)))) {
break;
}
/*
* Use intersection of the RSN cap sent by user space and
* the AP, so that only common capability are enabled.
*/
if (pProfile->pRSNReqIE && pProfile->nRSNReqIELength) {
dot11f_unpack_ie_rsn(pMac, pProfile->pRSNReqIE + 2,
pProfile->nRSNReqIELength -2, &rsn_ie, false);
pIesLocal->RSN.RSN_Cap[0] = pIesLocal->RSN.RSN_Cap[0] &
rsn_ie.RSN_Cap[0];
pIesLocal->RSN.RSN_Cap[1] = pIesLocal->RSN.RSN_Cap[1] &
rsn_ie.RSN_Cap[1];
}
/* See if the cyphers in the Bss description match with the
* settings in the profile.
*/
@ -3914,14 +3928,12 @@ uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId,
qdf_mem_copy(&pAuthSuite->AuthOui[0], AuthSuite,
sizeof(AuthSuite));
/* RSN capabilities follows the Auth Suite (two octects)
* !!REVIEW - What should STA put in RSN capabilities, currently
* just putting back APs capabilities For one, we shouldn't
* EVER be sending out "pre-auth supported". It is an AP only
* capability For another, we should use the Management Frame
* Protection values given by the supplicant
*/
/* PreAuthSupported is an AP only capability */
RSNCapabilities.PreAuthSupported = 0;
/*
* Use the Management Frame Protection values given by the
* supplicant, if AP and STA both are MFP capable.
*/
#ifdef WLAN_FEATURE_11W
if (RSNCapabilities.MFPCapable && pProfile->MFPCapable) {
RSNCapabilities.MFPCapable = pProfile->MFPCapable;