qcacld-3.0: Clean up roam_scan_period_after_inactivity

Cleanup roam scan period after inactivity timer.

Change-Id: Idba15ef9c41fdfe339e24df4ec87a66277986ee3
CRs-Fixed: 3515188

components/mlme/core/src/wlan_mlme_main.c

@@ -2997,14 +2997,6 @@ static void mlme_init_lfr_cfg(struct wlan_objmgr_psoc *psoc,
 	lfr->roam_inactive_data_packet_count =
 		cfg_get(psoc, CFG_ROAM_INACTIVE_COUNT);
 
-	if (val)
-		lfr->roam_scan_period_after_inactivity =
-			cfg_get(psoc, CFG_ROAM_SCAN_SECOND_TIMER) * 1000;
-
-	else
-		lfr->roam_scan_period_after_inactivity =
-			cfg_get(psoc, CFG_POST_INACTIVITY_ROAM_SCAN_PERIOD);
-
 	lfr->fw_akm_bitmap = 0;
 	lfr->enable_ft_im_roaming = cfg_get(psoc, CFG_FT_IM_ROAMING);
 	lfr->enable_ft_over_ds = !ENABLE_FT_OVER_DS;

components/mlme/dispatcher/inc/cfg_mlme_lfr.h

@@ -3125,12 +3125,8 @@
  * firmware gets empty roam scan results during periodic roam scans.
  * 1. roam_scan_inactivity_time
  * 2. roam_inactive_data_count
- * 3. roam_scan_period_after_inactivity
  * The first two ini "roam_scan_inactivity_time" and "roam_inactive_data_count"
- * is frames the criteria to detect if the DUT is inactive. If the device is
- * identified to be inactive based on the above two ini, then the value,
- * "roam_scan_period_after_inactivity" will be used as periodic roam scan
- * duration.
+ * is frames the criteria to detect if the DUT is inactive.
  *
  * Related: roam_inactive_data_count
  *
@@ -3214,37 +3210,6 @@
 	CFG_VALUE_OR_DEFAULT, \
 	"Roam scan inactivity period data pkt count")
 
-/*
- * <ini>
- * roam_scan_period_after_inactivity - Roam scan duration in ms after device is
- * out of inactivity state.
- *
- * @Min: 0
- * @Max: 0xFFFFFFFF
- * @Default: 120000
- *
- * If there is empty scan results during roam scan, firmware will move to
- * roam scan inactive state if roam_scan_inactivity and
- * roam_inactive_data_count criteria are met.
- * This ini is used to configure the roam scan duration in ms once the
- * inactivity is finished and roam scan can be started.
- *
- * Related: roam_scan_inactivity_time, roam_inactive_data_count
- *
- * Supported Feature: Roaming
- *
- * Usage: External
- *
- * </ini>
- */
-#define CFG_POST_INACTIVITY_ROAM_SCAN_PERIOD CFG_INI_UINT( \
-	"roam_scan_period_after_inactivity", \
-	0, \
-	0xFFFFFFFF, \
-	120000, \
-	CFG_VALUE_OR_DEFAULT, \
-	"Roam scan period post inactivity")
-
 /*
  * <ini>
  * RoamScan_InactiveTimer - Roam scan duration in sec after device is
@@ -3420,7 +3385,6 @@
 	CFG(CFG_FT_IM_ROAMING) \
 	CFG(CFG_ROAM_INACTIVE_COUNT) \
 	CFG(CFG_ROAM_PASSIVE_MAX_CHANNEL_TIME) \
-	CFG(CFG_POST_INACTIVITY_ROAM_SCAN_PERIOD) \
 	CFG(CFG_ROAM_SCAN_INACTIVE_TIMER) \
 	CFG(CFG_BSS_LOAD_TRIG_6G_RSSI_THRES) \
 	CFG(CFG_BSS_LOAD_TRIG_5G_RSSI_THRES) \

components/mlme/dispatcher/inc/wlan_mlme_public_struct.h

@@ -1956,8 +1956,6 @@ struct fw_scan_channels {
  * milliseconds for which the device is considered to be inactive.
  * @roam_inactive_data_packet_count: Maximum allowed data packets count
  * during roam_scan_inactivity_time.
- * @roam_scan_period_after_inactivity: Roam scan period after device was in
- * inactive state
  * @fw_akm_bitmap: Supported Akm suites of firmware
  * @roam_full_scan_period: Idle period in seconds between two successive
  * full channel roam scans
@@ -2090,7 +2088,6 @@ struct wlan_mlme_lfr_cfg {
 	bool roaming_scan_policy;
 	uint32_t roam_scan_inactivity_time;
 	uint32_t roam_inactive_data_packet_count;
-	uint32_t roam_scan_period_after_inactivity;
 	uint32_t fw_akm_bitmap;
 	uint32_t roam_full_scan_period;
 	struct fw_scan_channels saved_freq_list;

components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.c

@@ -1272,8 +1272,6 @@ cm_roam_scan_offload_scan_period(uint8_t vdev_id,
 				cfg_params->roam_scan_inactivity_time;
 	params->roam_inactive_data_packet_count =
 			cfg_params->roam_inactive_data_packet_count;
-	params->roam_scan_period_after_inactivity =
-			cfg_params->roam_scan_period_after_inactivity;
 	params->full_scan_period =
 			cfg_params->full_roam_scan_period;
 	mlme_debug("full_scan_period:%d, empty_scan_refresh_period:%d",
@@ -5133,8 +5131,6 @@ cm_restore_default_roaming_params(struct wlan_mlme_psoc_ext_obj *mlme_obj,
 			mlme_obj->cfg.lfr.roam_scan_inactivity_time;
 	cfg_params->roam_inactive_data_packet_count =
 			mlme_obj->cfg.lfr.roam_inactive_data_packet_count;
-	cfg_params->roam_scan_period_after_inactivity =
-			mlme_obj->cfg.lfr.roam_scan_period_after_inactivity;
 	ucfg_reg_get_band(wlan_vdev_get_pdev(vdev), &current_band);
 	rso_cfg->roam_band_bitmask = current_band;
 }

components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h

@@ -315,7 +315,6 @@ struct rso_chan_info {
  * @roam_scan_n_probes:
  * @roam_scan_inactivity_time:
  * @roam_inactive_data_packet_count:
- * @roam_scan_period_after_inactivity:
  */
 struct rso_cfg_params {
 	uint32_t neighbor_scan_period;
@@ -346,7 +345,6 @@ struct rso_cfg_params {
 	uint8_t roam_scan_n_probes;
 	uint32_t roam_scan_inactivity_time;
 	uint32_t roam_inactive_data_packet_count;
-	uint32_t roam_scan_period_after_inactivity;
 };
 
 /**
@@ -1866,8 +1864,6 @@ struct wlan_roam_reason_vsie_enable {
  * device is considered to be inactive
  * @roam_inactive_data_packet_count: Maximum allowed data packets count during
  * roam_scan_inactivity_time.
- * @roam_scan_period_after_inactivity: Roam scan period in ms after device is
- * in inactive state.
  * @full_scan_period: Full scan period is the idle period in seconds
  * between two successive full channel roam scans.
  */
@@ -1878,7 +1874,6 @@ struct wlan_roam_scan_period_params {
 	uint32_t scan_age;
 	uint32_t roam_scan_inactivity_time;
 	uint32_t roam_inactive_data_packet_count;
-	uint32_t roam_scan_period_after_inactivity;
 	uint32_t full_scan_period;
 };
 

components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c

@@ -1303,7 +1303,6 @@ wlan_cm_roam_cfg_set_value(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
 		rso_cfg->roam_control_enable = src_config->bool_value;
 		if (!rso_cfg->roam_control_enable)
 			break;
-		dst_cfg->roam_scan_period_after_inactivity = 0;
 		dst_cfg->roam_inactive_data_packet_count = 0;
 		dst_cfg->roam_scan_inactivity_time = 0;
 		if (mlme_obj->cfg.lfr.roam_scan_offload_enabled)
@@ -1547,8 +1546,6 @@ QDF_STATUS wlan_cm_rso_config_init(struct wlan_objmgr_vdev *vdev,
 		mlme_obj->cfg.lfr.roam_scan_inactivity_time;
 	cfg_params->roam_inactive_data_packet_count =
 		mlme_obj->cfg.lfr.roam_inactive_data_packet_count;
-	cfg_params->roam_scan_period_after_inactivity =
-		mlme_obj->cfg.lfr.roam_scan_period_after_inactivity;
 
 	chan_info = &cfg_params->specific_chan_info;
 	chan_info->num_chan =

components/wmi/src/wmi_unified_roam_tlv.c

@@ -374,8 +374,6 @@ send_roam_scan_offload_scan_period_cmd_tlv(
 			param->roam_scan_inactivity_time;
 	scan_period_fp->roam_inactive_count =
 			param->roam_inactive_data_packet_count;
-	scan_period_fp->roam_scan_period_after_inactivity =
-			param->roam_scan_period_after_inactivity;
 	/* Firmware expects the full scan period in msec whereas host
 	 * provides the same in seconds.
 	 * Convert it to msec and send to firmware
@@ -387,10 +385,9 @@ send_roam_scan_offload_scan_period_cmd_tlv(
 		  scan_period_fp->roam_scan_age,
 		  scan_period_fp->roam_full_scan_period);
 
-	wmi_debug("inactiviy time:%d inactive cnt:%d time after inactivity:%d",
+	wmi_debug("inactiviy time:%d inactive cnt:%d",
 		  scan_period_fp->inactivity_time_period,
-		  scan_period_fp->roam_inactive_count,
-		  scan_period_fp->roam_scan_period_after_inactivity);
+		  scan_period_fp->roam_inactive_count);
 
 	wmi_mtrace(WMI_ROAM_SCAN_PERIOD, NO_SESSION, 0);
 	status = wmi_unified_cmd_send(wmi_handle, buf, len,