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

Since new rso ROAM_OFFLOAD_V1 path is enabled, remove the old rso path code for cm/wmi roam related files. Change-Id: Iec350f032c3e037204f560199d4a6e258ac02688 CRs-Fixed: 2810145
2020-11-02 15:45:09 +08:00
commit ad188263dd
--- a/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.h
+++ b/components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.h
@@ -114,7 +114,6 @@ QDF_STATUS
 cm_roam_send_disable_config(struct wlan_objmgr_psoc *psoc,
 			    uint8_t vdev_id, uint8_t cfg);

-#ifdef ROAM_OFFLOAD_V1
 #if defined(WLAN_FEATURE_ROAM_OFFLOAD) && defined(WLAN_FEATURE_FILS_SK)
 QDF_STATUS cm_roam_scan_offload_add_fils_params(
 		struct wlan_objmgr_psoc *psoc,
@@ -130,5 +129,4 @@ QDF_STATUS cm_roam_scan_offload_add_fils_params(
 	return QDF_STATUS_SUCCESS;
 }
 #endif /* FEATURE_ROAM_OFFLOAD && WLAN_FEATURE_FILS_SK */
-#endif /* ROAM_OFFLOAD_V1 */
 #endif /* _WLAN_CM_ROAM_OFFLOAD_H_ */
--- a/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_api.h
+++ b/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_api.h
@@ -31,7 +31,6 @@
 /* Default value of reason code */
 #define DISABLE_VENDOR_BTM_CONFIG 2

-#ifdef ROAM_OFFLOAD_V1
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
 /**
 * wlan_cm_enable_roaming_on_connected_sta() - Enable roaming on other connected
@@ -327,15 +326,6 @@ QDF_STATUS
 wlan_cm_roam_cfg_set_value(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
 			   enum roam_cfg_param roam_cfg_type,
 			   struct cm_roam_values_copy *src_config);
-#else
-static inline QDF_STATUS
-wlan_cm_roam_cfg_set_value(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
-			   enum roam_cfg_param roam_cfg_type,
-			   struct cm_roam_values_copy *src_config)
-{
-	return QDF_STATUS_SUCCESS;
-}
-#endif

 #ifdef WLAN_FEATURE_FILS_SK
 /**
--- a/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h
+++ b/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h
@@ -646,7 +646,6 @@ struct wlan_per_roam_config_req {
 	struct wlan_per_roam_config per_config;
 };

-#ifdef ROAM_OFFLOAD_V1
 #define NOISE_FLOOR_DBM_DEFAULT          (-96)
 #define RSSI_MIN_VALUE                   (-128)
 #define RSSI_MAX_VALUE                   (127)
@@ -1051,7 +1050,6 @@ struct wlan_roam_scan_channel_list {
 	uint32_t chan_freq_list[ROAM_MAX_CHANNELS];
 	uint8_t chan_cache_type;
 };
-#endif

 /**
 * struct wlan_roam_rssi_change_params  - RSSI change parameters to be sent over
@@ -1069,7 +1067,6 @@ struct wlan_roam_rssi_change_params {
 	int32_t rssi_change_thresh;
 };

-#ifdef ROAM_OFFLOAD_V1
 /**
 * struct wlan_roam_start_config - structure containing parameters for
 * roam start config
@@ -1165,8 +1162,6 @@ struct wlan_roam_update_config {
 	struct wlan_roam_triggers roam_triggers;
 };

-#endif
-
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
 /**
 * enum roam_offload_state - Roaming module state for each STA vdev.
@@ -1274,7 +1269,6 @@ struct set_pcl_req {
 struct wlan_cm_roam_tx_ops {
 	QDF_STATUS (*send_vdev_set_pcl_cmd)(struct wlan_objmgr_vdev *vdev,
 					    struct set_pcl_req *req);
-#ifdef ROAM_OFFLOAD_V1
 	QDF_STATUS (*send_roam_offload_init_req)(
 			struct wlan_objmgr_vdev *vdev,
 			struct wlan_roam_offload_init_params *params);
@@ -1295,7 +1289,6 @@ struct wlan_cm_roam_tx_ops {
 					 struct wlan_roam_triggers *req);
 	QDF_STATUS (*send_roam_disable_config)(struct wlan_objmgr_vdev *vdev,
 				struct roam_disable_cfg *req);
-#endif
 };

 /**
--- a/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_ucfg_api.h
+++ b/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_ucfg_api.h
@@ -25,8 +25,6 @@

 #include "wlan_cm_roam_api.h"

-#ifdef ROAM_OFFLOAD_V1
-
 /**
 * ucfg_user_space_enable_disable_rso() - Enable/Disable Roam Scan offload
 * to firmware.
@@ -155,4 +153,3 @@ ucfg_cm_update_roam_scan_scheme_bitmap(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 }
 #endif
-#endif
--- a/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_tgt_if_tx_api.h
+++ b/components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_tgt_if_tx_api.h
@@ -45,7 +45,6 @@ wlan_cm_roam_send_set_vdev_pcl(struct wlan_objmgr_psoc *psoc,
 }
 #endif /* WLAN_FEATURE_ROAM_OFFLOAD */

-#ifdef ROAM_OFFLOAD_V1
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
 /**
 * wlan_cm_tgt_send_roam_offload_init()  - Send WMI_VDEV_PARAM_ROAM_FW_OFFLOAD
@@ -142,5 +141,4 @@ QDF_STATUS wlan_cm_tgt_send_roam_triggers(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS wlan_cm_tgt_send_roam_disable_config(struct wlan_objmgr_psoc *psoc,
 						uint8_t vdev_id,
 						struct roam_disable_cfg *req);
-#endif
 #endif /* CM_TGT_IF_TX_API_H__ */
--- a/components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c
+++ b/components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c
@@ -26,7 +26,6 @@
 #include "wlan_policy_mgr_api.h"
 #include <wmi_unified_priv.h>

-#ifdef ROAM_OFFLOAD_V1
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
 QDF_STATUS
 wlan_cm_enable_roaming_on_connected_sta(struct wlan_objmgr_pdev *pdev,
@@ -229,7 +228,6 @@ QDF_STATUS wlan_cm_roam_stop_req(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
 {
 	return cm_roam_stop_req(psoc, vdev_id, reason);
 }
-#endif

 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 QDF_STATUS
@@ -468,7 +466,6 @@ wlan_cm_roam_get_vendor_btm_params(struct wlan_objmgr_psoc *psoc,
 }
 #endif

-#ifdef ROAM_OFFLOAD_V1
 QDF_STATUS wlan_cm_roam_cfg_get_value(struct wlan_objmgr_psoc *psoc,
 				      uint8_t vdev_id,
 				      enum roam_cfg_param roam_cfg_type,
@@ -560,7 +557,6 @@ wlan_cm_roam_cfg_set_value(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,

 	return status;
 }
-#endif

 #ifdef WLAN_FEATURE_FILS_SK
 QDF_STATUS wlan_cm_update_mlme_fils_connection_info(
--- a/components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_ucfg_api.c
+++ b/components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_ucfg_api.c
@@ -24,7 +24,6 @@
 #include "wlan_cm_roam_ucfg_api.h"
 #include "../../core/src/wlan_cm_roam_offload.h"

-#ifdef ROAM_OFFLOAD_V1
 QDF_STATUS
 ucfg_user_space_enable_disable_rso(struct wlan_objmgr_pdev *pdev,
 				   uint8_t vdev_id,
@@ -114,4 +113,3 @@ QDF_STATUS ucfg_cm_abort_roam_scan(struct wlan_objmgr_pdev *pdev,

 	return status;
 }
-#endif
--- a/components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_tgt_if_tx_api.c
+++ b/components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_tgt_if_tx_api.c
@@ -156,7 +156,6 @@ end:
 }
 #endif

-#ifdef ROAM_OFFLOAD_V1
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
 QDF_STATUS wlan_cm_tgt_send_roam_offload_init(struct wlan_objmgr_psoc *psoc,
 					      uint8_t vdev_id, bool is_init)
@@ -417,4 +416,3 @@ QDF_STATUS wlan_cm_tgt_send_roam_disable_config(struct wlan_objmgr_psoc *psoc,

 	return status;
 }
-#endif