ソースを参照

qcacld-3.0: Support 5.9 ghz channels for US

Add support for new 5.9 ghz channels 169, 173
and 177 in hdd and sap modules

Change-Id: I630df032d93624db20aed9891ec53256fcfd55ab
CRs-Fixed: 2751051
Gururaj Pandurangi 4 年 前
コミット
33b02c097e
2 ファイル変更10 行追加10 行削除
  1. 2 2
      core/hdd/src/wlan_hdd_cfg80211.c
  2. 8 8
      core/sap/src/sap_module.c

+ 2 - 2
core/hdd/src/wlan_hdd_cfg80211.c

@@ -1897,13 +1897,13 @@ static int wlan_hdd_set_acs_ch_range(
 		sap_cfg->acs_cfg.start_ch_freq =
 				wlan_reg_ch_to_freq(CHAN_ENUM_5180);
 		sap_cfg->acs_cfg.end_ch_freq =
-				wlan_reg_ch_to_freq(CHAN_ENUM_5865);
+				wlan_reg_ch_to_freq(CHAN_ENUM_5885);
 	} else if (hw_mode == QCA_ACS_MODE_IEEE80211ANY) {
 		sap_cfg->acs_cfg.hw_mode = eCSR_DOT11_MODE_abg;
 		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_5865);
+				wlan_reg_ch_to_freq(CHAN_ENUM_5885);
 	}
 
 	if (ht_enabled)

+ 8 - 8
core/sap/src/sap_module.c

@@ -2219,7 +2219,7 @@ void wlansap_extend_to_acs_range(mac_handle_t mac_handle,
 					wlan_reg_ch_to_freq(CHAN_ENUM_2432) ?
 					(*start_ch_freq - ACS_2G_EXTEND) :
 					wlan_reg_ch_to_freq(CHAN_ENUM_2412);
-	} else if (*start_ch_freq <= wlan_reg_ch_to_freq(CHAN_ENUM_5865)) {
+	} else if (*start_ch_freq <= wlan_reg_ch_to_freq(CHAN_ENUM_5885)) {
 		*bandStartChannel = CHAN_ENUM_5180;
 		tmp_start_ch_freq = (*start_ch_freq - ACS_5G_EXTEND) >
 					wlan_reg_ch_to_freq(CHAN_ENUM_5180) ?
@@ -2245,22 +2245,22 @@ void wlansap_extend_to_acs_range(mac_handle_t mac_handle,
 					wlan_reg_ch_to_freq(CHAN_ENUM_2484) ?
 					(*end_ch_freq + ACS_2G_EXTEND) :
 					wlan_reg_ch_to_freq(CHAN_ENUM_2484);
-	} else if (*end_ch_freq <= wlan_reg_ch_to_freq(CHAN_ENUM_5865)) {
-		*bandEndChannel = CHAN_ENUM_5865;
+	} 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) <=
-				     wlan_reg_ch_to_freq(CHAN_ENUM_5865) ?
+				     wlan_reg_ch_to_freq(CHAN_ENUM_5885) ?
 				     (*end_ch_freq + ACS_5G_EXTEND) :
-				     wlan_reg_ch_to_freq(CHAN_ENUM_5865);
+				     wlan_reg_ch_to_freq(CHAN_ENUM_5885);
 	} else if (WLAN_REG_IS_6GHZ_CHAN_FREQ(*end_ch_freq)) {
 		tmp_end_ch_freq = *end_ch_freq;
 		wlansap_update_end_range_6ghz(&tmp_end_ch_freq,
 					      bandEndChannel);
 	} else {
-		*bandEndChannel = CHAN_ENUM_5865;
+		*bandEndChannel = CHAN_ENUM_5885;
 		tmp_end_ch_freq = (*end_ch_freq + ACS_5G_EXTEND) <=
-				     wlan_reg_ch_to_freq(CHAN_ENUM_5865) ?
+				     wlan_reg_ch_to_freq(CHAN_ENUM_5885) ?
 				     (*end_ch_freq + ACS_5G_EXTEND) :
-				     wlan_reg_ch_to_freq(CHAN_ENUM_5865);
+				     wlan_reg_ch_to_freq(CHAN_ENUM_5885);
 
 		sap_err("unexpected end freq %d", *end_ch_freq);
 	}