qcacld-3.0: Change chan to freq in csr structures

Change chan to freq in csr structures for 6ghz

Change-Id: I6dc962175d95b202e647f55cfcb1f3d849fef6e2
CRs-Fixed: 2522212

mlme/dispatcher/inc/cfg_mlme_ibss.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -42,13 +42,13 @@
 
 /*
  * <ini>
- * gAdHocChannel5G - Default 5Ghz IBSS channel if channel is not
+ * gAdHocChannel5G - Default 5Ghz IBSS channel if channel freq is not
  * provided by supplicant.
- * @Min: 36
- * @Max: 165
- * @Default: 44
+ * @Min: 5180
+ * @Max: 5825
+ * @Default: 5220
  *
- * This ini is used to set default 5Ghz IBSS channel
+ * This ini is used to set default 5Ghz IBSS channel frequency
  * if channel is not provided by supplicant and band is 5Ghz
  *
  * Related: None
@@ -60,22 +60,22 @@
  * </ini>
  */
 #define CFG_IBSS_ADHOC_CHANNEL_5GHZ CFG_INI_UINT( \
-		"gAdHocChannel5G", \
-		36, \
-		165, \
-		44, \
+		"ad_hoc_ch_freq_5g", \
+		5180, \
+		5825, \
+		5220, \
 		CFG_VALUE_OR_DEFAULT, \
-		"Default 5Ghz IBSS channel if not provided by supplicant")
+		"Default 5Ghz IBSS ch freq if not provided by supplicant")
 
 /*
  * <ini>
- * gAdHocChannel24G - Default 2.4Ghz IBSS channel if channel is not
+ * gAdHocChannel24G - Default 2.4Ghz IBSS channel if channel freq is not
  * provided by supplicant.
- * @Min: 1
- * @Max: 14
- * @Default: 6
+ * @Min: 2412
+ * @Max: 2484
+ * @Default: 2437
  *
- * This ini is used to set default 2.4Ghz IBSS channel
+ * This ini is used to set default 2.4Ghz IBSS channel frequency
  * if channel is not provided by supplicant and band is 2.4Ghz
  *
  * Related: None
@@ -87,12 +87,12 @@
  * </ini>
  */
 #define CFG_IBSS_ADHOC_CHANNEL_24GHZ CFG_INI_UINT( \
-		"gAdHocChannel24G", \
-		1, \
-		14, \
-		6, \
+		"ad_hoc_ch_freq_2g", \
+		2412, \
+		2484, \
+		2437, \
 		CFG_VALUE_OR_DEFAULT, \
-		"Default 2.4Ghz IBSS channel if not provided by supplicant")
+		"Default 2.4Ghz IBSS ch freq if not provided by supplicant")
 
 /*
  * <ini>

mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -2057,7 +2057,7 @@ struct wlan_mlme_reg {
 	bool indoor_channel_support;
 	uint32_t scan_11d_interval;
 	uint32_t valid_channel_freq_list[CFG_VALID_CHANNEL_LIST_LEN];
-	uint8_t valid_channel_list_num;
+	uint32_t valid_channel_list_num;
 	uint8_t country_code[CFG_COUNTRY_CODE_LEN + 1];
 	uint8_t country_code_len;
 	bool enable_11d_in_world_mode;