From 3632d87c9a01ad296d968f19dd52bad6eb74decf Mon Sep 17 00:00:00 2001 From: Gururaj Pandurangi Date: Mon, 30 Mar 2020 14:56:59 -0700 Subject: [PATCH] qcacld-3.0: Modify band checks to account 6GHz freq Modify band checks in lim APIs to account 6GHz frequency Change-Id: Ieb08a14640074267c910a197f0d4d2f9bb467a54 CRs-Fixed: 2653415 --- core/mac/src/pe/lim/lim_ft.c | 2 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 2 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 1cf2ad0b6ba1..28afb12587d3 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -537,7 +537,7 @@ void lim_fill_ft_session(struct mac_context *mac, && pBeaconStruct->HTCaps.present); /* Assign default configured nss value in the new session */ - if (wlan_reg_is_5ghz_ch_freq(ft_session->curr_op_freq)) + if (!wlan_reg_is_24ghz_ch_freq(ft_session->curr_op_freq)) ft_session->vdev_nss = mac->vdev_type_nss_5g.sta; else ft_session->vdev_nss = mac->vdev_type_nss_2g.sta; diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 8110aa3329f0..8877a55f65dd 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -701,7 +701,7 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu (void *)&sme_start_bss_req->extendedRateSet, sizeof(tSirMacRateSet)); - if (wlan_reg_is_5ghz_ch_freq(session->curr_op_freq)) + if (!wlan_reg_is_24ghz_ch_freq(session->curr_op_freq)) vdev_type_nss = &mac_ctx->vdev_type_nss_5g; else vdev_type_nss = &mac_ctx->vdev_type_nss_2g; 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 fc860a1cbab6..19689941a8c5 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 @@ -1834,7 +1834,7 @@ void lim_handle_csa_offload_msg(struct mac_context *mac_ctx, if (WLAN_REG_IS_24GHZ_CH_FREQ(csa_params->csa_chan_freq) && session_entry->dot11mode == MLME_DOT11_MODE_11A) session_entry->dot11mode = MLME_DOT11_MODE_11G; - else if (WLAN_REG_IS_5GHZ_CH_FREQ(csa_params->csa_chan_freq) && + else if (!WLAN_REG_IS_24GHZ_CH_FREQ(csa_params->csa_chan_freq) && ((session_entry->dot11mode == MLME_DOT11_MODE_11G) || (session_entry->dot11mode == MLME_DOT11_MODE_11G_ONLY))) session_entry->dot11mode = MLME_DOT11_MODE_11A;