From 8cb3c6214bd0e1defe5968dc5669b7702ca9f58e Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Tue, 15 Dec 2015 16:51:18 -0800 Subject: [PATCH] qcacld-3.0: Fix the Rx data rate issue in 11b mode Check for VHT caps in vendor specific IE only if the dot11mode is set to 11ac or auto, so that the vht caps are included in association reuest frame only if the dot11 mode is 11ac. Change-Id: If72117e5a46a754ae602dabd596a2ad8aac33d2e CRs-Fixed: 952134 --- core/mac/src/pe/lim/lim_assoc_utils.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index b21a708b76..c981c28b1d 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -3382,6 +3382,7 @@ lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx, uint32_t *noa2_duration_from_beacon = NULL; uint32_t noa; uint32_t total_num_noa_desc = 0; + uint32_t selfStaDot11Mode = 0; cdf_mem_copy(current_ssid.ssId, session_entry->ssId.ssId, session_entry->ssId.length); @@ -3494,7 +3495,10 @@ lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx, lim_post_sme_message(mac_ctx, LIM_MLM_JOIN_CNF, (uint32_t *) &mlm_join_cnf); - if (beacon_probe_rsp->vendor2_ie.VHTCaps.present) { + wlan_cfg_get_int(mac_ctx, WNI_CFG_DOT11_MODE, &selfStaDot11Mode); + + if ((IS_DOT11_MODE_VHT(selfStaDot11Mode)) && + beacon_probe_rsp->vendor2_ie.VHTCaps.present) { session_entry->is_vendor_specific_vhtcaps = true; session_entry->vendor_specific_vht_ie_type = beacon_probe_rsp->vendor2_ie.type;