qcacld-3.0: Cleanup ROAM_TARGET_IF_CONVERGENCE usage

wma to target_if convergence code is guarded under the feature
flag ROAM_TARGET_IF_CONVERGENCE and it's is enabled currently.
Remove the flag usage and remove the deprecated code(else part)
also.

Change-Id: I6973d9c366ec6a9c6164dd19f6f4775dd3ebf5f0
CRs-Fixed: 3049942

Kbuild

@@ -640,11 +640,6 @@ ifeq ($(CONFIG_QCACLD_FEATURE_NAN), y)
 MAC_NDP_OBJS += $(MAC_SRC_DIR)/pe/nan/nan_datapath.o
 endif
 
-#Temporarily enable ROAM_TARGET_IF_CONVERGENCE to enable wma to target_if roam
-#convergence. It shall be reverted sometime soon by removing the define
-#ROAM_TARGET_IF_CONVERGENCE usage and the legacy code(i.e. code in else part).
-cppflags-y += -DROAM_TARGET_IF_CONVERGENCE
-
 ifeq ($(CONFIG_QCACLD_WLAN_LFR2), y)
 	MAC_LIM_OBJS += $(MAC_SRC_DIR)/pe/lim/lim_process_mlm_host_roam.o \
 		$(MAC_SRC_DIR)/pe/lim/lim_send_frames_host_roam.o \

components/mlme/core/src/wlan_mlme_vdev_mgr_interface.c

@@ -303,13 +303,8 @@ QDF_STATUS sta_mlme_vdev_notify_roam_start(struct vdev_mlme_obj *vdev_mlme,
 {
 	mlme_legacy_debug("vdev id = %d ",
 			  vdev_mlme->vdev->vdev_objmgr.vdev_id);
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 	return wlan_cm_sta_mlme_vdev_roam_notify(vdev_mlme, event_data_len,
 						 event_data);
-#else
-	return wma_sta_mlme_vdev_roam_notify(vdev_mlme, event_data_len,
-					     event_data);
-#endif
 }
 
 /**

components/target_if/connection_mgr/inc/target_if_cm_roam_event.h

@@ -30,7 +30,6 @@
 #include <target_if.h>
 
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 /**
  * target_if_cm_roam_sync_event() - Target IF handler for roam sync events
  * @scn: target handle
@@ -133,7 +132,6 @@ target_if_cm_roam_scan_chan_list_event_handler(ol_scn_t scn, uint8_t *event,
 int
 target_if_pmkid_request_event_handler(ol_scn_t scn, uint8_t *event,
 				      uint32_t len);
-#endif /* ROAM_TARGET_IF_CONVERGENCE */
 
 /**
  * target_if_cm_roam_register_rx_ops  - Target IF API to register roam
@@ -151,7 +149,6 @@ target_if_cm_roam_register_rx_ops(struct wlan_cm_roam_rx_ops *rx_ops)
 {
 }
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 static inline
 QDF_STATUS
 target_if_roam_offload_register_events(struct wlan_objmgr_psoc *psoc)
@@ -185,6 +182,5 @@ target_if_pmkid_request_event_handler(ol_scn_t scn, uint8_t *event,
 {
 	return 0;
 }
-#endif /* ROAM_TARGET_IF_CONVERGENCE */
 #endif /* WLAN_FEATURE_ROAM_OFFLOAD */
 #endif

components/target_if/connection_mgr/src/target_if_cm_roam_event.c

@@ -53,7 +53,6 @@ target_if_cm_get_roam_rx_ops(struct wlan_objmgr_psoc *psoc)
 void
 target_if_cm_roam_register_rx_ops(struct wlan_cm_roam_rx_ops *rx_ops)
 {
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 	rx_ops->roam_sync_event = cm_roam_sync_event_handler;
 	rx_ops->roam_sync_frame_event = cm_roam_sync_frame_event_handler;
 	rx_ops->roam_event_rx = cm_roam_event_handler;
@@ -63,10 +62,8 @@ target_if_cm_roam_register_rx_ops(struct wlan_cm_roam_rx_ops *rx_ops)
 	rx_ops->roam_stats_event_rx = cm_roam_stats_event_handler;
 	rx_ops->roam_auth_offload_event = cm_roam_auth_offload_event_handler;
 	rx_ops->roam_pmkid_request_event_rx = cm_roam_pmkid_request_handler;
-#endif
 }
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 int
 target_if_cm_roam_sync_frame_event(ol_scn_t scn,
 				   uint8_t *event,
@@ -613,4 +610,3 @@ target_if_roam_offload_register_events(struct wlan_objmgr_psoc *psoc)
 
 	return QDF_STATUS_SUCCESS;
 }
-#endif

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

@@ -1135,7 +1135,6 @@ void cm_fw_ho_fail_req(struct wlan_objmgr_psoc *psoc,
 	}
 }
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 QDF_STATUS wlan_cm_free_roam_synch_frame_ind(struct rso_config *rso_cfg)
 {
 	struct roam_synch_frame_ind *frame_ind;
@@ -1163,4 +1162,3 @@ QDF_STATUS wlan_cm_free_roam_synch_frame_ind(struct rso_config *rso_cfg)
 
 	return QDF_STATUS_SUCCESS;
 }
-#endif /* ROAM_TARGET_IF_CONVERGENCE */

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

@@ -335,7 +335,6 @@ rel_ref:
 	return status;
 }
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 QDF_STATUS
 cm_roam_sync_event_handler(struct wlan_objmgr_psoc *psoc,
 			   uint8_t *event,
@@ -547,4 +546,3 @@ err:
 	}
 	return status;
 }
-#endif /* ROAM_TARGET_IF_CONVERGENCE */

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

@@ -972,7 +972,6 @@ QDF_STATUS
 cm_akm_roam_allowed(struct wlan_objmgr_psoc *psoc,
 		    struct wlan_objmgr_vdev *vdev);
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 /**
  * cm_invalid_roam_reason_handler() - Handler for invalid roam reason
  * @vdev_id: vdev id
@@ -1065,8 +1064,6 @@ cm_roam_sync_frame_event_handler(struct wlan_objmgr_psoc *psoc,
 QDF_STATUS cm_roam_sync_event_handler_cb(struct wlan_objmgr_vdev *vdev,
 					 uint8_t *event,
 					 uint32_t len);
-#endif /* ROAM_TARGET_IF_CONVERGENCE */
-
 #else
 static inline
 void wlan_cm_roam_activate_pcl_per_vdev(struct wlan_objmgr_psoc *psoc,
@@ -1198,7 +1195,6 @@ cm_akm_roam_allowed(struct wlan_objmgr_psoc *psoc,
 	return false;
 }
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 static inline void
 cm_handle_roam_reason_ho_failed(uint8_t vdev_id, struct qdf_mac_addr bssid,
 				struct cm_hw_mode_trans_ind *hw_mode_trans_ind)
@@ -1209,7 +1205,6 @@ cm_handle_scan_ch_list_data(struct cm_roam_scan_ch_resp *data)
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
-#endif
 #endif /* WLAN_FEATURE_ROAM_OFFLOAD */
 
 #ifdef WLAN_FEATURE_FIPS
@@ -1264,7 +1259,6 @@ QDF_STATUS wlan_get_chan_by_link_id_from_rnr(struct wlan_objmgr_vdev *vdev,
 					     uint8_t *chan, uint8_t *op_class);
 #endif
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 /**
  * cm_rso_cmd_status_event_handler() - Handler for rso cmd status
  * @vdev_id: vdev id
@@ -1485,12 +1479,4 @@ wlan_cm_fw_to_host_phymode(WMI_HOST_WLAN_PHY_MODE phymode);
 QDF_STATUS
 wlan_cm_sta_mlme_vdev_roam_notify(struct vdev_mlme_obj *vdev_mlme,
 				  uint16_t data_len, void *data);
-#else
-static inline QDF_STATUS
-wlan_cm_sta_mlme_vdev_roam_notify(struct vdev_mlme_obj *vdev_mlme,
-				  uint16_t data_len, void *data)
-{
-	return QDF_STATUS_E_NOSUPPORT;
-}
-#endif /* ROAM_TARGET_IF_CONVERGENCE */
 #endif  /* WLAN_CM_ROAM_API_H__ */

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

@@ -1979,7 +1979,6 @@ enum roam_reason {
 	ROAM_REASON_DEAUTH,
 };
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 /*
  * struct roam_blacklist_timeout - BTM blacklist entry
  * @bssid: bssid that is to be blacklisted
@@ -2061,7 +2060,6 @@ enum roam_dispatcher_events {
 	ROAM_PMKID_REQ_EVENT,
 	ROAM_VDEV_DISCONNECT_EVENT,
 };
-#endif
 
 /**
  * struct roam_offload_roam_event: Data carried by roam event
@@ -2392,7 +2390,6 @@ struct wlan_cm_roam_rx_ops {
 	QDF_STATUS (*roam_sync_frame_event)(struct wlan_objmgr_psoc *psoc,
 					    struct roam_synch_frame_ind *frm);
 	QDF_STATUS (*roam_event_rx)(struct roam_offload_roam_event *roam_event);
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 	QDF_STATUS (*btm_blacklist_event)(struct wlan_objmgr_psoc *psoc,
 					  struct roam_blacklist_event *list);
 	QDF_STATUS
@@ -2406,6 +2403,5 @@ struct wlan_cm_roam_rx_ops {
 	(*roam_auth_offload_event)(struct auth_offload_event *auth_event);
 	QDF_STATUS
 	(*roam_pmkid_request_event_rx)(struct roam_pmkid_req_event *list);
-#endif
 };
 #endif

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

@@ -36,9 +36,7 @@
 
 /* Support for "Fast roaming" (i.e., ESE, LFR, or 802.11r.) */
 #define BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN 15
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 #define CM_MIN_RSSI 0 /* 0dbm */
-#endif
 
 #if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
 QDF_STATUS
@@ -2319,7 +2317,6 @@ QDF_STATUS wlan_get_chan_by_link_id_from_rnr(struct wlan_objmgr_vdev *vdev,
 }
 #endif
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 QDF_STATUS wlan_cm_sta_mlme_vdev_roam_notify(struct vdev_mlme_obj *vdev_mlme,
 					     uint16_t data_len, void *data)
 {
@@ -2331,9 +2328,7 @@ QDF_STATUS wlan_cm_sta_mlme_vdev_roam_notify(struct vdev_mlme_obj *vdev_mlme,
 #endif
 	return status;
 }
-#endif
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 static void
 cm_handle_roam_offload_events(struct roam_offload_roam_event *roam_event)
@@ -2537,6 +2532,7 @@ cm_roam_scan_ch_list_event_handler(struct cm_roam_scan_ch_resp *data)
 	return cm_handle_scan_ch_list_data(data);
 }
 
+#ifdef WLAN_FEATURE_ROAM_OFFLOAD
 /**
  * cm_roam_stats_get_trigger_detail_str - Return roam trigger string from the
  * enum roam_trigger_reason
@@ -3087,7 +3083,7 @@ err:
 	qdf_mem_free(stats_info);
 	return status;
 }
-#endif /* ROAM_TARGET_IF_CONVERGENCE */
+#endif
 
 #ifdef WLAN_FEATURE_FIPS
 QDF_STATUS cm_roam_pmkid_req_ind(struct wlan_objmgr_psoc *psoc,

components/wmi/inc/wmi_unified_roam_api.h

@@ -238,7 +238,6 @@ wmi_unified_send_roam_preauth_status(wmi_unified_t wmi_handle,
 QDF_STATUS wmi_unified_vdev_set_pcl_cmd(wmi_unified_t wmi_handle,
 					struct set_pcl_cmd_params *params);
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 /**
  * wmi_extract_roam_sync_event  - Extract roam sync event
  * @wmi_handle: WMI handle
@@ -409,7 +408,6 @@ QDF_STATUS
 wmi_extract_roam_pmkid_request(wmi_unified_t wmi_handle,
 			       uint8_t *event, uint32_t data_len,
 			       struct roam_pmkid_req_event **data);
-#endif /* ROAM_TARGET_IF_CONVERGENCE */
 #endif /* WLAN_FEATURE_ROAM_OFFLOAD */
 
 /**

components/wmi/src/wmi_unified_roam_api.c

@@ -338,7 +338,6 @@ QDF_STATUS wmi_unified_set_roam_triggers(wmi_unified_t wmi_handle,
 	return QDF_STATUS_E_FAILURE;
 }
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 QDF_STATUS wmi_extract_roam_sync_event(wmi_unified_t wmi_handle, void *evt_buf,
 				       uint32_t len,
 				       struct roam_offload_synch_ind **sync_ind)
@@ -488,5 +487,4 @@ wmi_extract_roam_pmkid_request(wmi_unified_t wmi_handle,
 
 	return QDF_STATUS_E_FAILURE;
 }
-#endif /* ROAM_TARGET_IF_CONVERGENCE */
 #endif

components/wmi/src/wmi_unified_roam_tlv.c

@@ -1798,7 +1798,6 @@ extract_roam_frame_info_tlv(wmi_unified_t wmi_handle, void *evt_buf,
 	return QDF_STATUS_SUCCESS;
 }
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 static void
 wmi_extract_pdev_hw_mode_trans_ind(
 	wmi_pdev_hw_mode_transition_event_fixed_param *fixed_param,
@@ -2649,9 +2648,7 @@ extract_roam_event_tlv(wmi_unified_t wmi_handle, void *evt_buf, uint32_t len,
 end:
 	return status;
 }
-#endif
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 static enum blm_reject_ap_reason wmi_get_reject_reason(uint32_t reason)
 {
 	switch (reason) {
@@ -3245,7 +3242,6 @@ extract_roam_pmkid_request_tlv(wmi_unified_t wmi_handle, uint8_t *evt_buf,
 
 	return QDF_STATUS_SUCCESS;
 }
-#endif
 
 void wmi_roam_offload_attach_tlv(wmi_unified_t wmi_handle)
 {
@@ -3256,7 +3252,6 @@ void wmi_roam_offload_attach_tlv(wmi_unified_t wmi_handle)
 	ops->extract_roam_initial_info = extract_roam_initial_info_tlv;
 	ops->extract_roam_msg_info = extract_roam_msg_info_tlv;
 	ops->extract_roam_frame_info = extract_roam_frame_info_tlv;
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 	ops->extract_roam_sync_event = extract_roam_sync_event_tlv;
 	ops->extract_roam_sync_frame_event = extract_roam_sync_frame_event_tlv;
 	ops->extract_roam_event = extract_roam_event_tlv;
@@ -3266,7 +3261,6 @@ void wmi_roam_offload_attach_tlv(wmi_unified_t wmi_handle)
 	ops->extract_roam_stats_event = extract_roam_stats_event_tlv;
 	ops->extract_auth_offload_event = extract_auth_offload_event_tlv;
 	ops->extract_roam_pmkid_request = extract_roam_pmkid_request_tlv;
-#endif /* ROAM_TARGET_IF_CONVERGENCE */
 	ops->send_set_ric_req_cmd = send_set_ric_req_cmd_tlv;
 	ops->send_process_roam_synch_complete_cmd =
 			send_process_roam_synch_complete_cmd_tlv;
@@ -3297,7 +3291,6 @@ extract_roam_msg_info_tlv(wmi_unified_t wmi_handle, void *evt_buf,
 	return QDF_STATUS_E_NOSUPPORT;
 }
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 static inline QDF_STATUS
 extract_roam_sync_event(wmi_unified_t wmi_handle, void *evt_buf,
 			uint32_t len,
@@ -3319,7 +3312,6 @@ extract_roam_event(wmi_unified_t wmi_handle, void *evt_buf, uint32_t len,
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
-#endif /* ROAM_TARGET_IF_CONVERGENCE */
 #endif /* WLAN_FEATURE_ROAM_OFFLOAD */
 
 #define ROAM_OFFLOAD_PMK_EXT_BYTES 16

core/mac/src/include/sir_params.h

@@ -617,9 +617,6 @@ enum halmsgtype {
 	SIR_HAL_SEND_BCN_RSP              = (SIR_HAL_ITC_MSG_TYPES_BEGIN + 401),
 	SIR_HAL_CFG_VENDOR_ACTION_TB_PPDU = (SIR_HAL_ITC_MSG_TYPES_BEGIN + 402),
 	SIR_HAL_BEACON_DEBUG_STATS_REQ    = (SIR_HAL_ITC_MSG_TYPES_BEGIN + 403),
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-	SIR_HAL_ROAM_BLACKLIST_MSG        = (SIR_HAL_ITC_MSG_TYPES_BEGIN + 404),
-#endif
 
 #ifdef WLAN_FEATURE_MOTION_DETECTION
 	SIR_HAL_SET_MOTION_DET_CONFIG     = (SIR_HAL_ITC_MSG_TYPES_BEGIN + 405),

core/mac/src/pe/lim/lim_process_message_queue.c

@@ -2085,15 +2085,6 @@ static void lim_process_messages(struct mac_context *mac_ctx,
 		qdf_mem_free((void *)msg->bodyptr);
 		msg->bodyptr = NULL;
 		break;
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-	case WMA_ROAM_BLACKLIST_MSG:
-		lim_add_roam_blacklist_ap(mac_ctx,
-					  (struct roam_blacklist_event *)
-					  msg->bodyptr);
-		qdf_mem_free((void *)msg->bodyptr);
-		msg->bodyptr = NULL;
-		break;
-#endif
 	case SIR_LIM_PROCESS_DEFERRED_QUEUE:
 		break;
 	case CM_BSS_PEER_CREATE_REQ:

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -9213,43 +9213,3 @@ void lim_continue_sta_csa_req(struct mac_context *mac_ctx, uint8_t vdev_id)
 	pe_info("Continue CSA for STA vdev id %d", vdev_id);
 	lim_process_channel_switch(mac_ctx, vdev_id);
 }
-
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-void lim_add_roam_blacklist_ap(struct mac_context *mac_ctx,
-			       struct roam_blacklist_event *src_lst)
-{
-	uint32_t i;
-	struct sir_rssi_disallow_lst entry;
-	struct roam_blacklist_timeout *blacklist;
-
-	pe_debug("Received Blacklist event from FW num entries %d",
-		 src_lst->num_entries);
-	blacklist = &src_lst->roam_blacklist[0];
-	for (i = 0; i < src_lst->num_entries; i++) {
-
-		entry.bssid = blacklist->bssid;
-		entry.time_during_rejection = blacklist->received_time;
-		entry.reject_reason = blacklist->reject_reason;
-		entry.source = blacklist->source ? blacklist->source :
-						   ADDED_BY_TARGET;
-		entry.original_timeout = blacklist->original_timeout;
-		entry.received_time = blacklist->received_time;
-		/* If timeout = 0 and rssi = 0 ignore the entry */
-		if (!blacklist->timeout && !blacklist->rssi) {
-			continue;
-		} else if (blacklist->timeout) {
-			entry.retry_delay = blacklist->timeout;
-			/* set 0dbm as expected rssi */
-			entry.expected_rssi = LIM_MIN_RSSI;
-		} else {
-			/* blacklist timeout as 0 */
-			entry.retry_delay = blacklist->timeout;
-			entry.expected_rssi = blacklist->rssi;
-		}
-
-		/* Add this bssid to the rssi reject ap type in blacklist mgr */
-		lim_add_bssid_to_reject_list(mac_ctx->pdev, &entry);
-		blacklist++;
-	}
-}
-#endif

core/mac/src/pe/lim/lim_types.h

@@ -120,9 +120,6 @@ enum mlmmsgtype {
 #define MGMT_TX_USE_INCORRECT_KEY   BIT(0)
 
 #define LIM_DOS_PROTECTION_TIME 1000 //1000ms
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-#define LIM_MIN_RSSI 0 /* 0dbm */
-#endif
 /* enums used by LIM are as follows */
 
 enum eLimDisassocTrigger {
@@ -1241,19 +1238,6 @@ QDF_STATUS lim_process_sme_del_all_tdls_peers(struct mac_context *p_mac,
  */
 void lim_send_bcn_rsp(struct mac_context *mac_ctx, tpSendbeaconParams rsp);
 
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-/**
- * lim_add_roam_blacklist_ap() - handle the blacklist bssid list received from
- * firmware
- * @mac_ctx: Pointer to Global MAC structure
- * @list: roam blacklist ap list
- *
- * Return: None
- */
-void lim_add_roam_blacklist_ap(struct mac_context *mac_ctx,
-			       struct roam_blacklist_event *src_lst);
-#endif
-
 /**
  * lim_process_rx_channel_status_event() - processes
  * event WDA_RX_CHN_STATUS_EVENT

core/wma/inc/wma_api.h

@@ -566,21 +566,6 @@ bool wma_get_channel_switch_in_progress(struct wma_txrx_node *iface);
 QDF_STATUS wma_sta_mlme_vdev_start_continue(struct vdev_mlme_obj *vdev_mlme,
 					    uint16_t data_len, void *data);
 
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-/**
- * wma_sta_mlme_vdev_roam_notify() - VDEV roam notify handling
- * @vdev_mlme_obj:  VDEV MLME comp object
- * @data_len: data size
- * @data: event data
- *
- * API invokes VDEV roam event handling
- *
- * Return: SUCCESS on successful completion of roam event handling
- *         FAILURE, if it fails due to any
- */
-QDF_STATUS wma_sta_mlme_vdev_roam_notify(struct vdev_mlme_obj *vdev_mlme,
-					 uint16_t data_len, void *data);
-#endif
 /**
  * wma_ap_mlme_vdev_start_continue() - VDEV start response handling
  * @vdev_mlme_obj:  VDEV MLME comp object

core/wma/inc/wma_if.h

@@ -781,35 +781,4 @@ typedef struct sStatsExtRequest {
 } tStatsExtRequest, *tpStatsExtRequest;
 #endif /* WLAN_FEATURE_STATS_EXT */
 
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-/*
- * struct roam_blacklist_timeout - BTM blacklist entry
- * @bssid - bssid that is to be blacklisted
- * @timeout - time duration for which the bssid is blacklisted
- * @received_time - boot timestamp at which the firmware event was received
- * @rssi - rssi value for which the bssid is blacklisted
- * @reject_reason: reason to add the BSSID to BLM
- * @original_timeout: original timeout sent by the AP
- * @source: Source of adding the BSSID to BLM
- */
-struct roam_blacklist_timeout {
-	struct qdf_mac_addr bssid;
-	uint32_t timeout;
-	qdf_time_t received_time;
-	int32_t rssi;
-	enum blm_reject_ap_reason reject_reason;
-	uint32_t original_timeout;
-	enum blm_reject_ap_source source;
-};
-
-/*
- * struct roam_blacklist_event - Blacklist event entries destination structure
- * @num_entries: total entries sent over the event
- * @roam_blacklist: blacklist details
- */
-struct roam_blacklist_event {
-	uint32_t num_entries;
-	struct roam_blacklist_timeout roam_blacklist[];
-};
-#endif
 #endif /* _HALMSGAPI_H_ */

core/wma/inc/wma_internal.h

@@ -247,34 +247,7 @@ int wma_roam_auth_offload_event_handler(WMA_HANDLE handle, uint8_t *event,
  */
 int wma_roam_stats_event_handler(WMA_HANDLE handle, uint8_t *event,
 				 uint32_t len);
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-/**
- * wma_mlme_roam_synch_event_handler_cb() - roam synch event handler
- * @handle: wma handle
- * @event: event data
- * @len: length of data
- *
- * This function is roam synch event handler. It sends roam
- * indication for upper layer.
- *
- * Return: Success or Failure status
- */
-int wma_mlme_roam_synch_event_handler_cb(void *handle, uint8_t *event,
-					 uint32_t len);
 
-/**
- * wma_roam_synch_frame_event_handler() - roam synch frame event handler
- * @handle: wma handle
- * @event: event data
- * @len: length of data
- *
- * This function is roam synch frame event handler.
- *
- * Return: Success or Failure status
- */
-int wma_roam_synch_frame_event_handler(void *handle, uint8_t *event,
-					uint32_t len);
-#endif /* ROAM_TARGET_IF_CONVERGENCE */
 /**
  * wma_roam_vdev_disconnect_event_handler() - Handles roam vdev disconnect event
  * @handle: wma_handle

core/wma/inc/wma_types.h

@@ -396,9 +396,6 @@ enum wmamsgtype {
 	WMA_POWER_DEBUG_STATS_REQ = SIR_HAL_POWER_DEBUG_STATS_REQ,
 	WMA_BEACON_DEBUG_STATS_REQ = SIR_HAL_BEACON_DEBUG_STATS_REQ,
 	WMA_GET_RCPI_REQ = SIR_HAL_GET_RCPI_REQ,
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-	WMA_ROAM_BLACKLIST_MSG = SIR_HAL_ROAM_BLACKLIST_MSG,
-#endif
 	WMA_SET_DBS_SCAN_SEL_CONF_PARAMS = SIR_HAL_SET_DBS_SCAN_SEL_PARAMS,
 
 	WMA_SET_WOW_PULSE_CMD = SIR_HAL_SET_WOW_PULSE_CMD,

core/wma/src/wma_features.c

@@ -2743,13 +2743,8 @@ static int wma_wake_event_piggybacked(
 				    NULL, NULL, wake_reason,
 				    pb_event_len);
 		if (pb_event_len > 0) {
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 			errno = target_if_cm_roam_event(wma, pb_event,
 							pb_event_len);
-#else
-			errno = wma_roam_event_callback(wma, pb_event,
-							pb_event_len);
-#endif
 		} else {
 			/*
 			 * No wow_packet_buffer means a better AP beacon
@@ -2812,23 +2807,13 @@ static int wma_wake_event_piggybacked(
 		break;
 	case WOW_REASON_ROAM_PMKID_REQUEST:
 		wma_debug("Host woken up because of PMKID request event");
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-		errno = wma_roam_pmkid_request_event_handler(wma, pb_event,
-							     pb_event_len);
-#else
 		errno = target_if_pmkid_request_event_handler(wma,
 					pb_event, pb_event_len);
-#endif
 		break;
 	case WOW_REASON_VDEV_DISCONNECT:
 		wma_debug("Host woken up because of vdev disconnect event");
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-		errno = wma_roam_vdev_disconnect_event_handler(wma, pb_event,
-							       pb_event_len);
-#else
 		errno = target_if_cm_roam_vdev_disconnect_event_handler(wma,
 					pb_event, pb_event_len);
-#endif
 		break;
 	default:
 		wma_err("Wake reason %s(%u) is not a piggybacked event",

core/wma/src/wma_main.c

@@ -3083,9 +3083,7 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
 	/* Register Converged Event handlers */
 	init_deinit_register_tgt_psoc_ev_handlers(psoc);
 
-#ifdef ROAM_TARGET_IF_CONVERGENCE
 	target_if_roam_offload_register_events(psoc);
-#endif /* ROAM_TARGET_IF_CONVERGENCE */
 
 	/* Initialize max_no_of_peers for wma_get_number_of_peers_supported() */
 	cds_cfg->max_station = wma_init_max_no_of_peers(wma_handle,
@@ -3345,45 +3343,6 @@ QDF_STATUS wma_open(struct wlan_objmgr_psoc *psoc,
 	wma_register_extscan_event_handler(wma_handle);
 #endif /* WLAN_FEATURE_STATS_EXT */
 
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-	wmi_unified_register_event_handler(wma_handle->wmi_handle,
-					   wmi_roam_synch_event_id,
-					   wma_roam_synch_event_handler,
-					   WMA_RX_SERIALIZER_CTX);
-	wmi_unified_register_event_handler(wma_handle->wmi_handle,
-				   wmi_roam_synch_frame_event_id,
-				   wma_roam_synch_frame_event_handler,
-				   WMA_RX_SERIALIZER_CTX);
-
-	wmi_unified_register_event_handler(wma_handle->wmi_handle,
-					   wmi_roam_blacklist_event_id,
-					   wma_handle_btm_blacklist_event,
-					   WMA_RX_SERIALIZER_CTX);
-
-	wmi_unified_register_event_handler(wma_handle->wmi_handle,
-					wmi_vdev_disconnect_event_id,
-					wma_roam_vdev_disconnect_event_handler,
-					WMA_RX_SERIALIZER_CTX);
-
-	wmi_unified_register_event_handler(wma_handle->wmi_handle,
-					wmi_roam_scan_chan_list_id,
-					wma_roam_scan_chan_list_event_handler,
-					WMA_RX_SERIALIZER_CTX);
-
-	wmi_unified_register_event_handler(wma_handle->wmi_handle,
-					   wmi_roam_stats_event_id,
-					   wma_roam_stats_event_handler,
-					   WMA_RX_SERIALIZER_CTX);
-
-	wmi_unified_register_event_handler(wma_handle->wmi_handle,
-					   wmi_roam_auth_offload_event_id,
-					   wma_roam_auth_offload_event_handler,
-					   WMA_RX_SERIALIZER_CTX);
-	wma_register_pmkid_req_event_handler(wma_handle);
-#endif /* ROAM_TARGET_IF_CONVERGENCE */
-
-#endif /* WLAN_FEATURE_ROAM_OFFLOAD */
 	wmi_unified_register_event_handler(wma_handle->wmi_handle,
 				wmi_rssi_breach_event_id,
 				wma_rssi_breached_event_handler,
@@ -4140,18 +4099,6 @@ QDF_STATUS wma_start(void)
 		goto end;
 	}
 
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-	qdf_status = wmi_unified_register_event_handler(wmi_handle,
-						    wmi_roam_event_id,
-						    wma_roam_event_callback,
-						    WMA_RX_SERIALIZER_CTX);
-	if (QDF_IS_STATUS_ERROR(qdf_status)) {
-		wma_err("Failed to register Roam callback");
-		qdf_status = QDF_STATUS_E_FAILURE;
-		goto end;
-	}
-#endif
-
 	qdf_status = wmi_unified_register_event_handler(wmi_handle,
 						    wmi_wow_wakeup_host_event_id,
 						    wma_wow_wakeup_host_event,

core/wma/src/wma_utils.c

@@ -4332,28 +4332,6 @@ QDF_STATUS wma_sta_mlme_vdev_start_continue(struct vdev_mlme_obj *vdev_mlme,
 	return QDF_STATUS_SUCCESS;
 }
 
-#ifndef ROAM_TARGET_IF_CONVERGENCE
-QDF_STATUS wma_sta_mlme_vdev_roam_notify(struct vdev_mlme_obj *vdev_mlme,
-					 uint16_t data_len, void *data)
-{
-	tp_wma_handle wma;
-	int ret;
-	QDF_STATUS status = QDF_STATUS_SUCCESS;
-
-	wma = cds_get_context(QDF_MODULE_ID_WMA);
-	if (!wma)
-		return QDF_STATUS_E_INVAL;
-
-	ret = wma_mlme_roam_synch_event_handler_cb(wma, data, data_len);
-	if (ret != 0) {
-		wma_err("Failed to process roam synch event");
-		status = QDF_STATUS_E_FAILURE;
-	}
-
-	return status;
-}
-#endif
-
 QDF_STATUS wma_ap_mlme_vdev_start_continue(struct vdev_mlme_obj *vdev_mlme,
 					   uint16_t data_len, void *data)
 {