summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCNSS_WLAN Service <cnssbldsw@qualcomm.com>2017-09-28 02:32:39 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-09-28 02:32:39 -0700
commit82822e20226129f33215d578cdfd020b729fd212 (patch)
tree3f3277ec749990e59ecb9c8a1bfab6655cf4c02f
parente1cf1f899e5a6504deab8a60c6206493c274e124 (diff)
parent12beaeb835fe3536de4168df853a0f3b4556db49 (diff)
Merge "qcacld-3.0: Consider vender VHT IE as well in AP scoring logic" into wlan-cld3.driver.lnx.1.1
-rw-r--r--core/mac/src/pe/lim/lim_scan_result_utils.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c
index 2f4651e040cc..9ab751978488 100644
--- a/core/mac/src/pe/lim/lim_scan_result_utils.c
+++ b/core/mac/src/pe/lim/lim_scan_result_utils.c
@@ -214,10 +214,15 @@ lim_collect_bss_description(tpAniSirGlobal pMac,
if (pBPR->HTCaps.supportedChannelWidthSet)
pBssDescr->chan_width = eHT_CHANNEL_WIDTH_40MHZ;
}
+
/* VHT Parameters */
- if (pBPR->VHTCaps.present) {
+ if (IS_BSS_VHT_CAPABLE(pBPR->VHTCaps) ||
+ IS_BSS_VHT_CAPABLE(pBPR->vendor_vht_ie.VHTCaps)) {
pBssDescr->vht_caps_present = 1;
- if (pBPR->VHTCaps.suBeamFormerCap)
+ if ((IS_BSS_VHT_CAPABLE(pBPR->VHTCaps) &&
+ pBPR->VHTCaps.suBeamFormerCap) ||
+ (IS_BSS_VHT_CAPABLE(pBPR->vendor_vht_ie.VHTCaps) &&
+ pBPR->vendor_vht_ie.VHTCaps.suBeamFormerCap))
pBssDescr->beacomforming_capable = 1;
}
if (pBPR->VHTOperation.present)