Просмотр исходного кода

qcacld-3.0: Remove Unused RSO functions

Remove Unused functions wlan_cm_abort_rso and
sme_abort_roaming.

Change-Id: I3ff40cc7d526adea5cac61522c27142f7c73bcbe
CRs-Fixed: 3101169
Abhishek Singh 3 лет назад
Родитель
Сommit
af5e1cfadb

+ 0 - 14
components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_api.h

@@ -239,20 +239,6 @@ QDF_STATUS wlan_cm_enable_rso(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
 			      enum wlan_cm_rso_control_requestor requestor,
 			      uint8_t reason);
 
-/**
- * wlan_cm_abort_rso() - Enable roam scan offload to firmware
- * @pdev: Pointer to pdev
- * @vdev_id: vdev id
- *
- * Returns:
- * QDF_STATUS_E_BUSY if roam_synch is in progress and upper layer has to wait
- *                   before RSO stop cmd can be issued;
- * QDF_STATUS_SUCCESS if roam_synch is not outstanding. RSO stop cmd will be
- *                    issued with the global SME lock held in this case, and
- *                    uppler layer doesn't have to do any wait.
- */
-QDF_STATUS wlan_cm_abort_rso(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id);
-
 /**
  * wlan_cm_roaming_in_progress() - check if roaming is in progress
  * @pdev: Pointer to pdev

+ 0 - 37
components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c

@@ -265,43 +265,6 @@ bool wlan_cm_host_roam_in_progress(struct wlan_objmgr_psoc *psoc,
 	return host_roam_in_progress;
 }
 
-QDF_STATUS wlan_cm_abort_rso(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id)
-{
-	struct wlan_objmgr_psoc *psoc = wlan_pdev_get_psoc(pdev);
-	QDF_STATUS status;
-	struct wlan_objmgr_vdev *vdev;
-
-	vdev = wlan_objmgr_get_vdev_by_id_from_pdev(pdev, vdev_id,
-						    WLAN_MLME_CM_ID);
-	if (!vdev) {
-		mlme_err("vdev object is NULL");
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	status = cm_roam_acquire_lock(vdev);
-	if (QDF_IS_STATUS_ERROR(status))
-		goto release_ref;
-
-	if (MLME_IS_ROAM_SYNCH_IN_PROGRESS(psoc, vdev_id) ||
-	    wlan_cm_host_roam_in_progress(psoc, vdev_id)) {
-		cm_roam_release_lock(vdev);
-		status = QDF_STATUS_E_BUSY;
-		goto release_ref;
-	}
-
-	/* RSO stop cmd will be issued with lock held to avoid
-	 * any racing conditions with wma/csr layer
-	 */
-	wlan_cm_disable_rso(pdev, vdev_id, REASON_DRIVER_DISABLED,
-			    RSO_INVALID_REQUESTOR);
-
-	cm_roam_release_lock(vdev);
-release_ref:
-	wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_CM_ID);
-
-	return status;
-}
-
 bool wlan_cm_roaming_in_progress(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id)
 {
 	bool roaming_in_progress = false;

+ 0 - 19
core/sme/inc/sme_api.h

@@ -987,25 +987,6 @@ QDF_STATUS sme_start_roaming(mac_handle_t mac_handle, uint8_t sessionId,
 			     uint8_t reason,
 			     enum wlan_cm_rso_control_requestor requestor);
 
-/**
- * sme_abort_roaming() - Try to stop RSO if conditions allowable
- * This function checks if the current roaming state machine allows RSO stop
- * cmd to be issued, and stops roaming if allowed, otherwise, indicate to
- * the caller that a wait is required.
- *
- * @mac_handle - The handle returned by mac_open
- * @session_id - Session identifier
- *
- * Returns:
- * QDF_STATUS_E_BUSY if roam_synch is in progress and upper layer has to wait
- *                   before RSO stop cmd can be issued;
- * QDF_STATUS_SUCCESS if roam_synch is not outstanding. RSO stop cmd will be
- *                    issued with the global SME lock held in this case, and
- *                    uppler layer doesn't have to do any wait.
- */
-QDF_STATUS sme_abort_roaming(mac_handle_t mac_handle, uint8_t vdev_id);
-
-
 /**
  * sme_roaming_in_progress() - check if roaming is in progress
  * @mac_handle - The handle returned by mac_open

+ 0 - 14
core/sme/src/common/sme_api.c

@@ -6459,20 +6459,6 @@ QDF_STATUS sme_start_roaming(mac_handle_t mac_handle, uint8_t vdev_id,
 	return wlan_cm_enable_rso(mac->pdev, vdev_id, requestor, reason);
 }
 
-QDF_STATUS sme_abort_roaming(mac_handle_t mac_handle, uint8_t vdev_id)
-{
-	struct mac_context *mac = MAC_CONTEXT(mac_handle);
-	struct csr_roam_session *session;
-
-	session = CSR_GET_SESSION(mac, vdev_id);
-	if (!session) {
-		sme_err("ROAM: incorrect vdev ID %d", vdev_id);
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	return wlan_cm_abort_rso(mac->pdev, vdev_id);
-}
-
 bool sme_roaming_in_progress(mac_handle_t mac_handle, uint8_t vdev_id)
 {
 	struct mac_context *mac = MAC_CONTEXT(mac_handle);