From dfb5d709fb813fc31cea5f7504f89b7235c049a7 Mon Sep 17 00:00:00 2001 From: vineetv Date: Thu, 25 Jun 2020 10:12:58 +0530 Subject: [PATCH] : Disable CH14 for JAPAN We do not enable CH14 for JAPAN on all of our products and have disabled it on 8998 as well. QC SR : 04679882 Change-Id: Ibd37d238877c81b180dcd1e3e72e84ef4d868592 Signed-off-by: vineetv Reviewed-on: https://gerrit.mot.com/1642393 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Prashanth Chakravarthy Submit-Approved: Jira Key --- core/hdd/src/wlan_hdd_cfg80211.c | 4 ++-- core/sap/src/sap_module.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 3c5cd5e6ad03..c0216bd2c447 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -269,7 +269,7 @@ static const struct ieee80211_channel hdd_channels_2_4_ghz[] = { HDD2GHZCHAN(2462, 11, 0), HDD2GHZCHAN(2467, 12, 0), HDD2GHZCHAN(2472, 13, 0), - HDD2GHZCHAN(2484, 14, 0), + }; static const struct ieee80211_channel hdd_channels_5_ghz[] = { @@ -1944,7 +1944,7 @@ static int wlan_hdd_set_acs_ch_range( sap_cfg->acs_cfg.start_ch_freq = wlan_reg_ch_to_freq(CHAN_ENUM_2412); sap_cfg->acs_cfg.end_ch_freq = - wlan_reg_ch_to_freq(CHAN_ENUM_2484); + wlan_reg_ch_to_freq(CHAN_ENUM_2472); } else if (hw_mode == QCA_ACS_MODE_IEEE80211G) { sap_cfg->acs_cfg.hw_mode = eCSR_DOT11_MODE_11g; sap_cfg->acs_cfg.start_ch_freq = diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 13199719d16d..dd3cdc0d1c09 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -2337,11 +2337,11 @@ void wlansap_extend_to_acs_range(mac_handle_t mac_handle, } if (*end_ch_freq <= wlan_reg_ch_to_freq(CHAN_ENUM_2484)) { - *bandEndChannel = CHAN_ENUM_2484; + *bandEndChannel = CHAN_ENUM_2472; tmp_end_ch_freq = (*end_ch_freq + ACS_2G_EXTEND) <= - wlan_reg_ch_to_freq(CHAN_ENUM_2484) ? + wlan_reg_ch_to_freq(CHAN_ENUM_2472) ? (*end_ch_freq + ACS_2G_EXTEND) : - wlan_reg_ch_to_freq(CHAN_ENUM_2484); + wlan_reg_ch_to_freq(CHAN_ENUM_2472); } else if (*end_ch_freq <= wlan_reg_ch_to_freq(CHAN_ENUM_5885)) { *bandEndChannel = CHAN_ENUM_5885; tmp_end_ch_freq = (*end_ch_freq + ACS_5G_EXTEND) <=