qcacld-3.0: Remove old rso path code [PART 2]

Since new rso ROAM_OFFLOAD_V1 path is enabled, remove
the old rso path code for wma layer related files.

Change-Id: Ie4639a6f04877aa41046706118936560200162a6
CRs-Fixed: 2808064

core/wma/inc/wma.h

@@ -2035,19 +2035,6 @@ void wma_vdev_clear_pause_bit(uint8_t vdev_id, wmi_tx_pause_type bit_pos)
 	iface->pause_bitmap &= ~(1 << bit_pos);
 }
 
-#ifndef ROAM_OFFLOAD_V1
-/**
- * wma_process_roaming_config() - process roam request
- * @wma_handle: wma handle
- * @roam_req: roam request parameters
- *
- * Main routine to handle ROAM commands coming from CSR module.
- *
- * Return: QDF status
- */
-QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle,
-				     struct roam_offload_scan_req *roam_req);
-#endif
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 /**
  * wma_send_roam_preauth_status() - Send the preauth status to wmi

core/wma/inc/wma_api.h

@@ -808,26 +808,6 @@ int wma_wlm_stats_req(int vdev_id, uint32_t bitmask, uint32_t max_size,
 int wma_wlm_stats_rsp(void *wma_ctx, uint8_t *event, uint32_t len);
 #endif /* FEATURE_WLM_STATS */
 
-#ifndef ROAM_OFFLOAD_V1
-/**
- * wma_update_roam_offload_flag() -  update roam offload flag to fw
- * @wma:     wma handle
- * @params: Roaming enable/disable params
- *
- * Return: none
- */
-void wma_update_roam_offload_flag(void *handle,
-				  struct roam_init_params *params);
-/**
- * wma_set_roam_disable_cfg() - Set roam module disable cfg to fw
- * @wma: wma handle
- * @params: Roaming module enable/disable params
- *
- * Return: none
- */
-void wma_set_roam_disable_cfg(void *handle, struct roam_disable_cfg *params);
-#endif
-
 /**
  * wma_self_peer_create() - create self peer in objmgr
  * @vdev_mlme: vdev mlme component private object

core/wma/inc/wma_internal.h

@@ -344,27 +344,9 @@ wma_roam_scan_chan_list_event_handler(WMA_HANDLE handle, uint8_t *event,
 }
 #endif
 
-#ifndef ROAM_OFFLOAD_V1
-/**
- * wma_update_per_roam_config() -per roam config parameter updation to FW
- * @handle: wma handle
- * @req_buf: per roam config parameters
- *
- * Return: none
- */
-void wma_update_per_roam_config(WMA_HANDLE handle,
-				 struct wlan_per_roam_config_req *req_buf);
-#endif
 QDF_STATUS wma_update_channel_list(WMA_HANDLE handle,
 				   tSirUpdateChanList *chan_list);
 
-#if defined(WLAN_FEATURE_ROAM_OFFLOAD) && !defined(ROAM_OFFLOAD_V1)
-QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
-					roam_offload_param *
-					roam_offload_params,
-					struct roam_offload_scan_req *roam_req);
-#endif
-
 A_UINT32 e_csr_auth_type_to_rsn_authmode(enum csr_akm_type authtype,
 					 eCsrEncryptionType encr);
 

core/wma/inc/wma_types.h

@@ -223,9 +223,6 @@ enum wmamsgtype {
 	WMA_SET_PLM_REQ = SIR_HAL_SET_PLM_REQ,
 #endif
 
-#ifndef ROAM_OFFLOAD_V1
-	WMA_ROAM_SCAN_OFFLOAD_REQ = SIR_HAL_ROAM_SCAN_OFFLOAD_REQ,
-#endif
 	WMA_ROAM_PRE_AUTH_STATUS = SIR_HAL_ROAM_PRE_AUTH_STATUS_IND,
 
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
@@ -409,10 +406,6 @@ enum wmamsgtype {
 
 	WMA_SET_WOW_PULSE_CMD = SIR_HAL_SET_WOW_PULSE_CMD,
 
-#ifndef ROAM_OFFLOAD_V1
-	WMA_SET_PER_ROAM_CONFIG_CMD = SIR_HAL_SET_PER_ROAM_CONFIG_CMD,
-#endif
-
 	WMA_SEND_AP_VDEV_UP = SIR_HAL_SEND_AP_VDEV_UP,
 
 	WMA_SET_ARP_STATS_REQ = SIR_HAL_SET_ARP_STATS_REQ,
@@ -444,12 +437,6 @@ enum wmamsgtype {
 	WMA_GET_MWS_COEX_INFO_REQ = SIR_HAL_GET_MWS_COEX_INFO_REQ,
 #endif
 
-#ifndef ROAM_OFFLOAD_V1
-	WMA_SET_ROAM_TRIGGERS = SIR_HAL_SET_ROAM_TRIGGERS,
-	WMA_ROAM_INIT_PARAM = SIR_HAL_INIT_ROAM_OFFLOAD_PARAM,
-	WMA_ROAM_DISABLE_CFG = SIR_HAL_INIT_ROAM_DISABLE_CFG,
-
-#endif
 	WMA_TWT_ADD_DIALOG_REQUEST = SIR_HAL_TWT_ADD_DIALOG_REQUEST,
 	WMA_TWT_DEL_DIALOG_REQUEST = SIR_HAL_TWT_DEL_DIALOG_REQUEST,
 	WMA_TWT_PAUSE_DIALOG_REQUEST = SIR_HAL_TWT_PAUSE_DIALOG_REQUEST,

core/wma/src/wma_main.c

@@ -8526,12 +8526,7 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg)
 				(tpSirRcvFltMcAddrList) msg->bodyptr);
 		qdf_mem_free(msg->bodyptr);
 		break;
-#ifndef ROAM_OFFLOAD_V1
-	/* this is temp will be removed once ROAM_OFFLOAD_V1 is enabled */
-	case WMA_ROAM_SCAN_OFFLOAD_REQ:
-		wma_process_roaming_config(wma_handle, msg->bodyptr);
-		break;
-#endif
+
 	case WMA_ROAM_PRE_AUTH_STATUS:
 		wma_send_roam_preauth_status(wma_handle, msg->bodyptr);
 		qdf_mem_free(msg->bodyptr);
@@ -8698,13 +8693,6 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg)
 		qdf_mem_free(msg->bodyptr);
 		break;
 #endif /* FEATURE_WLAN_EXTSCAN */
-#ifndef ROAM_OFFLOAD_V1
-	case WMA_SET_PER_ROAM_CONFIG_CMD:
-		wma_update_per_roam_config(wma_handle,
-			(struct wlan_per_roam_config_req *)msg->bodyptr);
-		qdf_mem_free(msg->bodyptr);
-		break;
-#endif
 	case WMA_SET_SCAN_MAC_OUI_REQ:
 		wma_scan_probe_setoui(wma_handle, msg->bodyptr);
 		qdf_mem_free(msg->bodyptr);
@@ -9008,21 +8996,6 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg)
 		wma_get_mws_coex_info_req(wma_handle, msg->bodyptr);
 		qdf_mem_free(msg->bodyptr);
 		break;
-#endif
-#ifndef ROAM_OFFLOAD_V1
-	/* This code will be removed once ROAM_OFFLOAD_V1 is enabled */
-	case WMA_SET_ROAM_TRIGGERS:
-		wma_set_roam_triggers(wma_handle, msg->bodyptr);
-		qdf_mem_free(msg->bodyptr);
-		break;
-	case WMA_ROAM_INIT_PARAM:
-		wma_update_roam_offload_flag(wma_handle, msg->bodyptr);
-		qdf_mem_free(msg->bodyptr);
-		break;
-	case WMA_ROAM_DISABLE_CFG:
-		wma_set_roam_disable_cfg(wma_handle, msg->bodyptr);
-		qdf_mem_free(msg->bodyptr);
-		break;
 #endif
 	case WMA_ROAM_SCAN_CH_REQ:
 		wma_get_roam_scan_ch(wma_handle->wmi_handle, msg->bodyval);

core/wma/src/wma_mgmt.c

@@ -2414,7 +2414,6 @@ void wma_beacon_miss_handler(tp_wma_handle wma, uint32_t vdev_id, int32_t rssi)
 	wma_lost_link_info_handler(wma, vdev_id, rssi);
 }
 
-#ifdef ROAM_OFFLOAD_V1
 void wlan_cm_send_beacon_miss(uint8_t vdev_id, int32_t rssi)
 {
 	tp_wma_handle wma;
@@ -2427,7 +2426,7 @@ void wlan_cm_send_beacon_miss(uint8_t vdev_id, int32_t rssi)
 
 	wma_beacon_miss_handler(wma, vdev_id, rssi);
 }
-#endif
+
 /**
  * wma_get_status_str() - get string of tx status from firmware
  * @status: tx status

core/wma/src/wma_utils.c

@@ -3929,103 +3929,6 @@ int wma_rcpi_event_handler(void *handle, uint8_t *cmd_param_info,
 	return 0;
 }
 
-#ifndef ROAM_OFFLOAD_V1
-/**
- * wma_set_roam_offload_flag() -  Set roam offload flag to fw
- * @wma:     wma handle
- * @vdev_id: vdev id
- * @is_set:  set or clear
- *
- * Return: none
- */
-static void wma_set_roam_offload_flag(tp_wma_handle wma, uint8_t vdev_id,
-				      bool is_set)
-{
-	QDF_STATUS status;
-	uint32_t flag = 0;
-	bool disable_4way_hs_offload;
-	bool bmiss_skip_full_scan;
-
-	if (is_set) {
-		flag = WMI_ROAM_FW_OFFLOAD_ENABLE_FLAG |
-		       WMI_ROAM_BMISS_FINAL_SCAN_ENABLE_FLAG;
-
-		wlan_mlme_get_4way_hs_offload(wma->psoc,
-					      &disable_4way_hs_offload);
-		/*
-		 * If 4-way HS offload is disabled then let supplicant handle
-		 * 4way HS and firmware will still do LFR3.0 till reassoc phase.
-		 */
-		if (disable_4way_hs_offload)
-			flag |= WMI_VDEV_PARAM_SKIP_ROAM_EAPOL_4WAY_HANDSHAKE;
-
-		wlan_mlme_get_bmiss_skip_full_scan_value(wma->psoc,
-							 &bmiss_skip_full_scan);
-		/*
-		 * If WMI_ROAM_BMISS_FINAL_SCAN_ENABLE_FLAG is set, then
-		 * WMI_ROAM_BMISS_FINAL_SCAN_TYPE_FLAG decides whether firmware
-		 * does channel map based partial scan or partial scan followed
-		 * by full scan in case no candidate is found in partial scan.
-		 */
-		if (bmiss_skip_full_scan)
-			flag |= WMI_ROAM_BMISS_FINAL_SCAN_TYPE_FLAG;
-	}
-
-	wma_debug("vdev_id:%d, is_set:%d, flag:%d", vdev_id, is_set, flag);
-	status = wma_vdev_set_param(wma->wmi_handle, vdev_id,
-				    WMI_VDEV_PARAM_ROAM_FW_OFFLOAD, flag);
-	if (QDF_IS_STATUS_ERROR(status))
-		wma_err("Failed to set WMI_VDEV_PARAM_ROAM_FW_OFFLOAD");
-}
-
-void wma_update_roam_offload_flag(void *handle,
-				  struct roam_init_params *params)
-{
-	tp_wma_handle wma = handle;
-	struct wma_txrx_node *iface;
-
-	if (!wma_is_vdev_valid(params->vdev_id)) {
-		wma_err("vdev_id: %d is not active", params->vdev_id);
-		return;
-	}
-
-	iface = &wma->interfaces[params->vdev_id];
-
-	if ((iface->type != WMI_VDEV_TYPE_STA) ||
-	    (iface->sub_type != 0)) {
-		wma_err("this isn't a STA: %d", params->vdev_id);
-		return;
-	}
-
-	wma_set_roam_offload_flag(wma, params->vdev_id, params->enable);
-}
-
-void wma_set_roam_disable_cfg(void *handle, struct roam_disable_cfg *params)
-{
-	tp_wma_handle wma = handle;
-	struct wma_txrx_node *iface;
-	QDF_STATUS status;
-
-	if (!wma_is_vdev_valid(params->vdev_id)) {
-		wma_err("vdev_id: %d is not active", params->vdev_id);
-		return;
-	}
-
-	iface = &wma->interfaces[params->vdev_id];
-
-	if ((iface->type != WMI_VDEV_TYPE_STA) ||
-	    (iface->sub_type != 0)) {
-		wma_err("this isn't a STA: %d", params->vdev_id);
-		return;
-	}
-
-	status = wma_vdev_set_param(wma->wmi_handle, params->vdev_id,
-				    WMI_VDEV_PARAM_ROAM_11KV_CTRL, params->cfg);
-	if (QDF_IS_STATUS_ERROR(status))
-		wma_err("Failed to set WMI_VDEV_PARAM_ROAM_11KV_CTRL");
-}
-#endif
-
 QDF_STATUS wma_send_vdev_down_to_fw(t_wma_handle *wma, uint8_t vdev_id)
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;