qcacld-3.0: Disable vendor VHT IE support if 2G 11ac disabled

Disable vendor VHT IE support if 11ac is disabled in 2.4G by
user configuration

Change-Id: I8920fae5352fa1a4c7356918bce3b27e2c4a3345
CRs-Fixed: 2052059

core/mac/src/pe/lim/lim_assoc_utils.c

@@ -3028,7 +3028,6 @@ 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;
 
 	qdf_mem_copy(current_ssid.ssId,
 		     session_entry->ssId.ssId, session_entry->ssId.length);
@@ -3162,9 +3161,7 @@ lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx,
 	lim_post_sme_message(mac_ctx, LIM_MLM_JOIN_CNF,
 			     (uint32_t *) &mlm_join_cnf);
 
-	wlan_cfg_get_int(mac_ctx, WNI_CFG_DOT11_MODE, &selfStaDot11Mode);
-
-	if ((IS_DOT11_MODE_VHT(selfStaDot11Mode)) &&
+	if ((IS_DOT11_MODE_VHT(session_entry->dot11mode)) &&
 		beacon_probe_rsp->vendor_vht_ie.VHTCaps.present) {
 		session_entry->is_vendor_specific_vhtcaps = true;
 		session_entry->vendor_specific_vht_ie_type =
@@ -4128,6 +4125,7 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update
 	pAddBssParams->currentOperChannel = bssDescription->channelId;
 	pe_debug("currentOperChannel %d",
 		pAddBssParams->currentOperChannel);
+
 	if (psessionEntry->vhtCapability &&
 		(IS_BSS_VHT_CAPABLE(pBeaconStruct->VHTCaps) ||
 		 IS_BSS_VHT_CAPABLE(pBeaconStruct->vendor_vht_ie.VHTCaps))) {