: 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 <vineetv@motorola.com>
Reviewed-on: https://gerrit.mot.com/1642393
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Prashanth Chakravarthy <a19110@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
vineetv 2020-06-25 10:12:58 +05:30 • committed by panyq6
commit dfb5d709fb
2 changed files with 5 additions and 5 deletions

View file

@ -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 =

View file

@ -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) <=