Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9021ddd authored by hqu's avatar hqu Committed by snandini
Browse files

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

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

Change-Id: I6527630951ca1c291e027e7ecdb3f9bf4b0a72b3
CRs-Fixed: 2808325
parent d40fa54c

core/sme/inc/csr_api.h

+0 −25
Original line number Diff line number Diff line
@@ -1410,31 +1410,6 @@ void csr_clear_channel_status(struct mac_context *mac); 
QDF_STATUS csr_update_owe_info(struct mac_context *mac,

			       struct assoc_ind *assoc_ind);



/**

 * csr_send_roam_offload_init_msg() - Send roam enable/disable flag to fw

 * @mac: mac context

 * @vdev_id: vdev id

 * @enable: enable/disable roam flag

 *

 * Return: QDF_STATUS

 */

QDF_STATUS

csr_send_roam_offload_init_msg(struct mac_context *mac, uint32_t vdev_id,

			       bool enable);



#ifndef ROAM_OFFLOAD_V1

/**

 * csr_send_roam_disable_cfg_msg() - Send roam module enable/disable cfg to fw

 * @mac: mac context

 * @vdev_id: vdev id

 * @cfg: roaming enable/disable cfg

 *

 * Return: QDF_STATUS

 */

QDF_STATUS csr_send_roam_disable_cfg_msg(struct mac_context *mac,

					 uint32_t vdev_id, uint8_t cfg);

#endif



typedef void (*csr_ani_callback)(int8_t *ani, void *context);



#ifdef WLAN_FEATURE_11W

core/sme/inc/csr_neighbor_roam.h

+0 −20
Original line number Diff line number Diff line
@@ -227,18 +227,6 @@ QDF_STATUS csr_post_roam_state_change(struct mac_context *mac, uint8_t vdev_id, 
				      enum roam_offload_state state,

				      uint8_t reason);



#ifndef ROAM_OFFLOAD_V1

/**

 * csr_post_rso_stop() - Post RSO stop message to WMA

 * @mac: mac context

 * @vdev_id: vdev id

 * @reason: reason for requesting RSO stop

 *

 * Return: QDF_STATUS

 */

QDF_STATUS

csr_post_rso_stop(struct mac_context *mac, uint8_t vdev_id, uint16_t reason);

#endif

/**

 * csr_enable_roaming_on_connected_sta() - Enable roaming on other connected

 *  sta vdev
@@ -276,14 +264,6 @@ QDF_STATUS csr_post_roam_state_change(struct mac_context *mac, uint8_t vdev_id, 
	return QDF_STATUS_E_NOSUPPORT;

}



#ifndef ROAM_OFFLOAD_V1

static inline

csr_post_rso_stop(struct mac_context *mac, uint8_t vdev_id, uint16_t reason)

{

	return QDF_STATUS_E_NOSUPPORT;

}

#endif



static inline QDF_STATUS

csr_enable_roaming_on_connected_sta(struct mac_context *mac, uint8_t vdev_id)

{

core/sme/src/csr/csr_api_roam.c

+399 −2658

File changed.

Preview size limit exceeded, changes collapsed.

core/sme/src/csr/csr_neighbor_roam.c

+0 −7
Original line number Diff line number Diff line
@@ -617,12 +617,7 @@ static void csr_roam_restore_default_config(struct mac_context *mac_ctx, 
	triggers.vdev_id = vdev_id;

	triggers.trigger_bitmap = wlan_mlme_get_roaming_triggers(mac_ctx->psoc);

	sme_debug("Reset roam trigger bitmap to 0x%x", triggers.trigger_bitmap);

#ifdef ROAM_OFFLOAD_V1

	wlan_cm_rso_set_roam_trigger(mac_ctx->pdev, vdev_id, &triggers);

#else

	/* temp change, This will be removed with ROAM_OFFLOAD_V1 enabled */

	sme_set_roam_triggers(MAC_HANDLE(mac_ctx), &triggers);

#endif

	sme_roam_control_restore_default_config(MAC_HANDLE(mac_ctx),

						vdev_id);

}
@@ -1273,7 +1268,6 @@ bool csr_neighbor_middle_of_roaming(struct mac_context *mac, uint8_t sessionId) 
	return val;

}



#ifdef ROAM_OFFLOAD_V1

bool

wlan_cm_neighbor_roam_in_progress(struct wlan_objmgr_psoc *psoc,

				  uint8_t vdev_id)
@@ -1295,7 +1289,6 @@ wlan_cm_neighbor_roam_in_progress(struct wlan_objmgr_psoc *psoc, 


	return csr_neighbor_middle_of_roaming(mac_ctx, vdev_id);

}

#endif



/**

 * csr_neighbor_roam_process_handoff_req - Processes handoff request