qcacld-3.0: clean up max scan count CFG/INI

Clean up CFG_MAX_SCAN_COUNT CFG CFG item.
Remove ini for max_scan_count. Use WLAN_MAX_ACTIVE_SCANS_ALLOWED
to initialize max_scan_count and send to firmware.

Change-Id: I52e07b63a82297d30f2532bc5a8e05004877b141
CRs-Fixed: 2382308

core/cds/inc/cds_config.h

@@ -58,7 +58,6 @@ enum cfg_sub_20_channel_width {
  * @dfs_pri_multiplier: dfs radar pri multiplier
  * @uc_offload_enabled: IPA Micro controller data path offload enable flag
  * @enable_rxthread: Rx processing in thread from TXRX
- * @max_scan: Maximum number of parallel scans
  * @tx_flow_stop_queue_th: Threshold to stop queue in percentage
  * @tx_flow_start_queue_offset: Start queue offset in percentage
  * @enable_dp_rx_threads: enable dp rx threads
@@ -87,7 +86,6 @@ struct cds_config_info {
 	uint8_t reorder_offload;
 	uint8_t uc_offload_enabled;
 	bool enable_rxthread;
-	uint8_t max_scan;
 #ifdef QCA_LL_TX_FLOW_CONTROL_V2
 	uint32_t tx_flow_stop_queue_th;
 	uint32_t tx_flow_start_queue_offset;

core/hdd/inc/wlan_hdd_cfg.h

@@ -143,36 +143,6 @@ enum hdd_dot11_mode {
 #define CFG_SCAN_AGING_PARAM_DEFAULT       (30)
 #endif
 
-/*
- * <ini>
- * max_scan_count - Set maximum number of scans
- * @Min: 1
- * @Max: 8
- * @Default: 4
- *
- * This ini is used to set the maximum number of
- * scans that host can queue at firmware.
- * Rome firmware support 8 scan queue size and 4
- * are reserved for internal scan requests like
- * roaming. So host can send 4 scan requests.
- * In iHelium, there is no constraint in number of
- * scan queue size at firmware but the current use
- * cases needs support of maximum of 4 scan request
- * from host.
- *
- * Related: None
- *
- * Supported Feature: Scan
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_MAX_SCAN_COUNT_NAME           "max_scan_count"
-#define CFG_MAX_SCAN_COUNT_MIN            (1)
-#define CFG_MAX_SCAN_COUNT_MAX            (8)
-#define CFG_MAX_SCAN_COUNT_DEFAULT        (4)
-
 /*
  * <ini>
  * extscan_adaptive_dwell_mode - Enable adaptive dwell mode
@@ -506,7 +476,6 @@ struct hdd_config {
 	bool enable_mac_spoofing;
 	uint8_t sap_11ac_override;
 	uint8_t go_11ac_override;
-	uint8_t max_scan_count;
 #ifdef FEATURE_LFR_SUBNET_DETECTION
 	bool enable_lfr_subnet_detection;
 #endif

core/hdd/src/wlan_hdd_cfg.c

@@ -121,13 +121,6 @@ struct reg_table_entry g_registry_table[] = {
 		     CFG_GO_11AC_OVERRIDE_MIN,
 		     CFG_GO_11AC_OVERRIDE_MAX),
 
-	REG_VARIABLE(CFG_MAX_SCAN_COUNT_NAME, WLAN_PARAM_Integer,
-		     struct hdd_config, max_scan_count,
-		     VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
-		     CFG_MAX_SCAN_COUNT_DEFAULT,
-		     CFG_MAX_SCAN_COUNT_MIN,
-		     CFG_MAX_SCAN_COUNT_MAX),
-
 #ifdef FEATURE_LFR_SUBNET_DETECTION
 	REG_VARIABLE(CFG_ENABLE_LFR_SUBNET_DETECTION, WLAN_PARAM_Integer,
 		     struct hdd_config, enable_lfr_subnet_detection,

core/hdd/src/wlan_hdd_main.c

@@ -9948,7 +9948,6 @@ static int hdd_update_cds_config(struct hdd_context *hdd_ctx)
 
 	/* IPA micro controller data path offload resource config item */
 	cds_cfg->uc_offload_enabled = ucfg_ipa_uc_is_enabled();
-	cds_cfg->max_scan = hdd_ctx->config->max_scan_count;
 
 	cds_cfg->enable_rxthread = hdd_ctx->enable_rxthread;
 	ucfg_mlme_get_sap_max_peers(hdd_ctx->psoc, &value);

core/wma/inc/wma.h

@@ -1048,7 +1048,6 @@ struct wma_valid_channels {
  *   tracked on a per-vdev basis via the struct sir_vdev_wow_stats
  *   wow_stats in struct wma_txrx_node
  * @ocb_config_req: OCB request context
- * @max_scan:  maximum scan requests than can be queued
  * @self_gen_frm_pwr: Self-generated frame power
  * @tx_chain_mask_cck: Is the CCK tx chain mask enabled
  * @service_ready_ext_timer: Timer for service ready extended.  Note
@@ -1187,7 +1186,6 @@ typedef struct {
 	wma_peer_authorized_fp peer_authorized_cb;
 	uint32_t wow_unspecified_wake_count;
 	struct sir_ocb_config *ocb_config_req;
-	uint8_t max_scan;
 	uint16_t self_gen_frm_pwr;
 	bool tx_chain_mask_cck;
 	qdf_mc_timer_t service_ready_ext_timer;

core/wma/src/wma_main.c

@@ -70,6 +70,7 @@
 #include "wlan_lmac_if_def.h"
 #include "wlan_lmac_if_api.h"
 #include "target_if.h"
+#include "target_if_scan.h"
 #include "wlan_global_lmac_if_api.h"
 #include "target_if_pmo.h"
 #include "wma_he.h"
@@ -247,7 +248,7 @@ static void wma_set_default_tgt_config(tp_wma_handle wma_handle,
 	tgt_cfg->rx_timeout_pri[2] = CFG_TGT_RX_TIMEOUT_LO_PRI;
 	tgt_cfg->rx_timeout_pri[3] = CFG_TGT_RX_TIMEOUT_HI_PRI;
 	tgt_cfg->rx_decap_mode = CFG_TGT_RX_DECAP_MODE;
-	tgt_cfg->scan_max_pending_req = wma_handle->max_scan;
+	tgt_cfg->scan_max_pending_req = WLAN_MAX_ACTIVE_SCANS_ALLOWED;
 	tgt_cfg->bmiss_offload_max_vdev =
 			CFG_TGT_DEFAULT_BMISS_OFFLOAD_MAX_VDEV;
 	tgt_cfg->roam_offload_max_vdev = CFG_TGT_DEFAULT_ROAM_OFFLOAD_MAX_VDEV;
@@ -3282,8 +3283,6 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
 	target_psoc_set_htc_hdl(tgt_psoc_info, htc_handle);
 	wma_handle->cds_context = cds_context;
 	wma_handle->qdf_dev = qdf_dev;
-	wma_handle->max_scan = cds_cfg->max_scan;
-
 	/* Register Converged Event handlers */
 	init_deinit_register_tgt_psoc_ev_handlers(psoc);