diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index d6d648ba4875..01f90394f285 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -774,7 +774,6 @@ struct mac_context { struct csr_roamstruct roam; tRrmContext rrm; uint8_t isCoalesingInIBSSAllowed; - uint8_t lteCoexAntShare; uint8_t beacon_offload; bool pmf_offload; bool is_fils_roaming_supported; diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index c5c4bba44abf..fc860a1cbab6 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -307,7 +307,7 @@ static void lim_handle_join_rsp_status(struct mac_context *mac_ctx, if (mac_ctx->roam.configParam.is_force_1x1 && is_vendor_ap_1_present && (session_entry->nss == 2) && - (mac_ctx->lteCoexAntShare == 0 || + (!mac_ctx->mlme_cfg->gen.as_enabled || wlan_reg_is_5ghz_ch_freq(session_entry->curr_op_freq))) { /* SET vdev param */ pe_debug("sending SMPS intolrent vdev_param"); diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index b544a6899519..0578a6149b02 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -7333,7 +7333,7 @@ QDF_STATUS lim_populate_he_mcs_set(struct mac_context *mac_ctx, (*(uint16_t *)peer_he_caps->tx_he_mcs_map_80_80)); if (session_entry->nss == NSS_2x2_MODE) { - if (mac_ctx->lteCoexAntShare && + if (mac_ctx->mlme_cfg->gen.as_enabled && wlan_reg_is_24ghz_ch_freq(session_entry->curr_op_freq)) { if (IS_2X2_CHAIN(session_entry->chainMask)) support_2x2 = true; diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 44d5823115cf..6f4261e40851 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -4010,7 +4010,7 @@ sme_fill_nss_chain_params(struct mac_context *mac_ctx, * If target supports Antenna sharing, set NSS to 1 for 2.4GHz band for * NDI vdev. */ - if (device_mode == QDF_NDI_MODE && mac_ctx->lteCoexAntShare && + if (device_mode == QDF_NDI_MODE && mac_ctx->mlme_cfg->gen.as_enabled && band == NSS_CHAINS_BAND_2GHZ) max_supported_nss = NSS_1x1_MODE; @@ -12779,7 +12779,6 @@ void sme_update_tgt_services(mac_handle_t mac_handle, mac_ctx->obss_scan_offload = cfg->obss_scan_offload; sme_debug("obss_scan_offload: %d", mac_ctx->obss_scan_offload); - mac_ctx->lteCoexAntShare = cfg->lte_coex_ant_share; mac_ctx->mlme_cfg->gen.as_enabled = cfg->lte_coex_ant_share; mac_ctx->beacon_offload = cfg->beacon_offload; mac_ctx->pmf_offload = cfg->pmf_offload; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 75252a94c93f..c5c244bfe63a 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -15869,7 +15869,8 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId, if (is_vendor_ap_present && !policy_mgr_is_hw_dbs_2x2_capable(mac->psoc) && ((mac->roam.configParam.is_force_1x1 == - FORCE_1X1_ENABLED_FOR_AS && mac->lteCoexAntShare) || + FORCE_1X1_ENABLED_FOR_AS && + mac->mlme_cfg->gen.as_enabled) || mac->roam.configParam.is_force_1x1 == FORCE_1X1_ENABLED_FORCED)) { pSession->supported_nss_1x1 = true; @@ -15908,7 +15909,7 @@ QDF_STATUS csr_send_join_req_msg(struct mac_context *mac, uint32_t sessionId, &vendor_ap_search_attr, ACTION_OUI_SWITCH_TO_11N_MODE); if (mac->roam.configParam.is_force_1x1 && - mac->lteCoexAntShare && + mac->mlme_cfg->gen.as_enabled && is_vendor_ap_present && (dot11mode == MLME_DOT11_MODE_ALL || dot11mode == MLME_DOT11_MODE_11AC ||