qcacld-3.0: Remove legacy cfg items

Remove legacy cfg items definitions and related macros for the
converged CFG items.

Change-Id: I12944f50d68dafe989417dda777f29a6233c97a4
CRs-Fixed: 2340856

fw_offload/core/inc/wlan_fw_offload_main.h

@@ -27,7 +27,7 @@
 #include <wlan_objmgr_global_obj.h>
 #include <wlan_cmn.h>
 
-#include "cfg_ie_whitelist.h"
+#include "cfg_ucfg_api.h"
 
 #define fwol_alert(params...) QDF_TRACE_FATAL(QDF_MODULE_ID_FWOL, params)
 #define fwol_err(params...) QDF_TRACE_ERROR(QDF_MODULE_ID_FWOL, params)

fw_offload/core/src/wlan_fw_offload_main.c

@@ -20,7 +20,6 @@
  */
 
 #include "wlan_fw_offload_main.h"
-#include "cfg_ucfg_api.h"
 
 struct wlan_fwol_psoc_obj *fwol_get_psoc_obj(struct wlan_objmgr_psoc *psoc)
 {

fw_offload/dispatcher/src/wlan_fwol_ucfg_api.c

@@ -19,7 +19,6 @@
  * DOC: define internal APIs related to the fwol component
  */
 
-#include "cfg_ucfg_api.h"
 #include "wlan_fw_offload_main.h"
 #include "wlan_fwol_ucfg_api.h"
 

mlme/core/src/wlan_mlme_main.c

@@ -23,7 +23,6 @@
 #include "cfg_ucfg_api.h"
 #include "wmi_unified.h"
 #include "wlan_scan_public_structs.h"
-#include "cfg_mlme_threshold.h"
 
 #define NUM_OF_SOUNDING_DIMENSIONS     1 /*Nss - 1, (Nss = 2 for 2x2)*/
 
@@ -1201,21 +1200,21 @@ static void mlme_init_oce_cfg(struct wlan_objmgr_psoc *psoc,
 static void mlme_init_wep_keys(struct wlan_mlme_wep_cfg *wep_params)
 {
 	/* initialize the default key values to zero */
-	wep_params->wep_default_key_1.len = MLME_WEP_MAX_KEY_LEN;
-	wep_params->wep_default_key_1.max_len = MLME_WEP_MAX_KEY_LEN;
-	qdf_mem_zero(wep_params->wep_default_key_1.data, MLME_WEP_MAX_KEY_LEN);
+	wep_params->wep_default_key_1.len = MLME_WEP_KEY_LEN_13;
+	wep_params->wep_default_key_1.max_len = MLME_WEP_KEY_LEN_13;
+	qdf_mem_zero(wep_params->wep_default_key_1.data, MLME_WEP_KEY_LEN_13);
 
-	wep_params->wep_default_key_2.len = MLME_WEP_MAX_KEY_LEN;
-	wep_params->wep_default_key_2.max_len = MLME_WEP_MAX_KEY_LEN;
-	qdf_mem_zero(wep_params->wep_default_key_2.data, MLME_WEP_MAX_KEY_LEN);
+	wep_params->wep_default_key_2.len = MLME_WEP_KEY_LEN_13;
+	wep_params->wep_default_key_2.max_len = MLME_WEP_KEY_LEN_13;
+	qdf_mem_zero(wep_params->wep_default_key_2.data, MLME_WEP_KEY_LEN_13);
 
-	wep_params->wep_default_key_3.len = MLME_WEP_MAX_KEY_LEN;
-	wep_params->wep_default_key_3.max_len = MLME_WEP_MAX_KEY_LEN;
-	qdf_mem_zero(wep_params->wep_default_key_3.data, MLME_WEP_MAX_KEY_LEN);
+	wep_params->wep_default_key_3.len = MLME_WEP_KEY_LEN_13;
+	wep_params->wep_default_key_3.max_len = MLME_WEP_KEY_LEN_13;
+	qdf_mem_zero(wep_params->wep_default_key_3.data, MLME_WEP_KEY_LEN_13);
 
-	wep_params->wep_default_key_4.len = MLME_WEP_MAX_KEY_LEN;
-	wep_params->wep_default_key_4.max_len = MLME_WEP_MAX_KEY_LEN;
-	qdf_mem_zero(wep_params->wep_default_key_4.data, MLME_WEP_MAX_KEY_LEN);
+	wep_params->wep_default_key_4.len = MLME_WEP_KEY_LEN_13;
+	wep_params->wep_default_key_4.max_len = MLME_WEP_KEY_LEN_13;
+	qdf_mem_zero(wep_params->wep_default_key_4.data, MLME_WEP_KEY_LEN_13);
 }
 
 static void mlme_init_wep_cfg(struct wlan_mlme_wep_cfg *wep_params)

mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -332,9 +332,36 @@ struct wlan_mlme_wps_params {
 	uint32_t wps_device_password_id;
 };
 
+#define MLME_CFG_LISTEN_INTERVAL        1
+#define MLME_CFG_BEACON_INTERVAL_DEF    100
+#define MLME_CFG_TX_MGMT_RATE_DEF       0xFF
+#define MLME_CFG_TX_MGMT_2G_RATE_DEF    0xFF
+#define MLME_CFG_TX_MGMT_5G_RATE_DEF    0xFF
 /**
- * struct wlan_mlme_ - HT Capabilities related config items
- * @ht_cap_info: HT capabilities Info Structure
+ * struct wlan_mlme_cfg_sap - SAP related config items
+ * @cfg_ssid: SSID to be configured
+ * @beacon_interval: beacon interval
+ * @dtim_interval:   dtim interval
+ * @listen_interval: listen interval
+ * @sap_11g_policy:  Check if 11g support is enabled
+ * @assoc_sta_limit: Limit on number of STA associated to SAP
+ * @enable_lte_coex: Flag for LTE coexistence
+ * @rmc_action_period_freq: rmc action period frequency
+ * @rate_tx_mgmt: mgmt frame tx rate
+ * @rate_tx_mgmt_2g: mgmt frame tx rate for 2G band
+ * @rate_tx_mgmt_5g: mgmt frame tx rate for 5G band
+ * @tele_bcn_wakeup_en: beacon wakeup enable/disable
+ * @tele_bcn_max_li: max listen interval
+ * @sap_get_peer_info: get peer info
+ * @sap_allow_all_chan_param_name: allow all channels
+ * @sap_max_no_peers: Maximum number of peers
+ * @sap_max_offload_peers: Maximum number of peer offloads
+ * @sap_max_offload_reorder_buffs: Maximum offload reorder buffs
+ * @sap_ch_switch_beacon_cnt: Number of beacons to be sent out during CSA
+ * @sap_internal_restart: flag to check if sap restart is in progress
+ * @sap_ch_switch_mode: Channel switch test mode enable/disable
+ * @chan_switch_hostapd_rate_enabled_name: enable/disable skip hostapd rate
+ * @reduced_beacon_interval: reduced beacon interval value
  */
 struct wlan_mlme_cfg_sap {
 	uint8_t cfg_ssid[32];
@@ -1178,7 +1205,8 @@ struct wlan_mlme_oce {
 	uint8_t feature_bitmap;
 };
 
-#define MLME_WEP_MAX_KEY_LEN (13)
+#define MLME_WEP_KEY_LEN_13 (13)
+#define MLME_WEP_KEY_LENGTH_5 (5)
 
 /**
  * enum wep_key_id  - values passed to get/set wep default keys