Browse Source

qcacld-3.0: Use min/max macro to update start/end range of 6ghz

Use MIN_6GHZ_CHANNEL to replace CHAN_ENUM_5945, MAX_6GHZ_CHANNEL to
replace CHAN_ENUM_7105, since min/max channel of 6ghz may be changed.

Change-Id: Ibb0aa4182162d956d632b271cbbfef5af07f918c
CRs-Fixed: 2706639
Wu Gao 4 years ago
parent
commit
5e262a7c8b
1 changed files with 6 additions and 6 deletions
  1. 6 6
      core/sap/src/sap_module.c

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

@@ -2154,21 +2154,21 @@ wlansap_reset_sap_config_add_ie(struct sap_config *config,
 static void wlansap_update_start_range_6ghz(
 	uint32_t *start_ch_freq, uint32_t *bandStartChannel)
 {
-	*bandStartChannel = CHAN_ENUM_5945;
+	*bandStartChannel = MIN_6GHZ_CHANNEL;
 	*start_ch_freq = (*start_ch_freq - ACS_5G_EXTEND) >
-				wlan_reg_ch_to_freq(CHAN_ENUM_5945) ?
+				wlan_reg_ch_to_freq(MIN_6GHZ_CHANNEL) ?
 			   (*start_ch_freq - ACS_5G_EXTEND) :
-				wlan_reg_ch_to_freq(CHAN_ENUM_5945);
+				wlan_reg_ch_to_freq(MIN_6GHZ_CHANNEL);
 }
 
 static void wlansap_update_end_range_6ghz(
 	uint32_t *end_ch_freq, uint32_t *bandEndChannel)
 {
-	*bandEndChannel = CHAN_ENUM_7105;
+	*bandEndChannel = MAX_6GHZ_CHANNEL;
 	*end_ch_freq = (*end_ch_freq + ACS_5G_EXTEND) <=
-			     wlan_reg_ch_to_freq(CHAN_ENUM_7105) ?
+			     wlan_reg_ch_to_freq(MAX_6GHZ_CHANNEL) ?
 			     (*end_ch_freq + ACS_5G_EXTEND) :
-			     wlan_reg_ch_to_freq(CHAN_ENUM_7105);
+			     wlan_reg_ch_to_freq(MAX_6GHZ_CHANNEL);
 }
 #else
 static void wlansap_update_start_range_6ghz(