qcacld-3.0: Clean up code under PRE_CAC_COMP flag

pre cac componentization is done, so clean up
code under PRE_CAC_COMP flag.

Change-Id: I6465bce9fc883797f42358aaeb8dabf70e449cde
CRs-Fixed: 3232820

Kbuild

@@ -1020,7 +1020,6 @@ cppflags-$(CONFIG_WLAN_HANG_EVENT) += -DWLAN_HANG_EVENT
 
 #Flag to enable pre_cac
 cppflags-$(CONFIG_FEATURE_WLAN_PRE_CAC)  += -DPRE_CAC_SUPPORT
-cppflags-$(CONFIG_FEATURE_WLAN_PRE_CAC)  += -DPRE_CAC_COMP
 
 ############ WBUFF ############
 WBUFF_OS_DIR :=	wbuff

components/pre_cac/dispatcher/inc/wlan_pre_cac_ucfg_api.h

@@ -229,6 +229,18 @@ ucfg_pre_cac_get_vdev_id(struct wlan_objmgr_psoc *psoc,
 {
 }
 
+static inline void
+ucfg_pre_cac_adapter_set(struct wlan_objmgr_vdev *vdev,
+			 bool status)
+{
+}
+
+static inline bool
+ucfg_pre_cac_adapter_is_active(struct wlan_objmgr_vdev *vdev)
+{
+	return false;
+}
+
 static inline void
 ucfg_pre_cac_set_freq(struct wlan_objmgr_vdev *vdev,
 		      qdf_freq_t freq)

core/hdd/inc/wlan_hdd_main.h

@@ -1592,19 +1592,6 @@ struct hdd_adapter {
 	qdf_work_t netdev_features_update_work;
 	enum hdd_work_status netdev_features_update_work_status;
 	qdf_atomic_t net_dev_hold_ref_count[NET_DEV_HOLD_ID_MAX];
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	/* Flag to indicate whether it is a pre cac adapter or not */
-	bool is_pre_cac_adapter;
-	/*
-	 * The pre cac channel frequency is saved here and will be used when
-	 * the SAP's channel needs to be moved from the existing 2.4GHz channel.
-	 */
-	uint32_t pre_cac_freq;
-#endif
 	bool delete_in_progress;
 	bool is_virtual_iface;
 #ifdef WLAN_FEATURE_BIG_DATA_STATS
@@ -2237,13 +2224,6 @@ struct hdd_context {
 
 	/* the radio index assigned by cnss_logger */
 	int radio_index;
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	qdf_work_t sap_pre_cac_work;
-#endif
 	bool hbw_requested;
 	bool pm_qos_request;
 	enum RX_OFFLOAD ol_enable;

core/hdd/inc/wlan_hdd_pre_cac.h

@@ -23,50 +23,6 @@
 /* default pre cac channel bandwidth */
 #define DEFAULT_PRE_CAC_BANDWIDTH CH_WIDTH_80MHZ
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-/**
- * wlan_hdd_sap_pre_cac_success() - Process the pre cac success
- * @data: AP adapter
- *
- * Return: None
- */
-void wlan_hdd_sap_pre_cac_success(void *data);
-#else
-static inline void wlan_hdd_sap_pre_cac_success(void *data)
-{
-}
-#endif /* PRE_CAC_COMP */
-
-/**
- * wlan_hdd_sap_pre_cac_failure() - Process the pre cac failure
- * @data: AP adapter
- *
- * Deletes the pre cac adapter
- *
- * Return: None
- */
-void wlan_hdd_sap_pre_cac_failure(void *data);
-
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-/**
- * hdd_clean_up_pre_cac_interface() - Clean up the pre cac interface
- * @hdd_ctx: HDD context
- *
- * Cleans up the pre cac interface, if it exists
- *
- * Return: None
- */
-void hdd_clean_up_pre_cac_interface(struct hdd_context *hdd_ctx);
-#endif
-
 /**
  * wlan_hdd_request_pre_cac() - Start pre CAC in the driver
  * @hdd_ctx: the HDD context to operate against
@@ -79,24 +35,6 @@ void hdd_clean_up_pre_cac_interface(struct hdd_context *hdd_ctx);
  */
 int wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx, uint32_t chan_freq);
 
-/**
- * hdd_send_conditional_chan_switch_status() - Send conditional channel switch
- * status
- * @hdd_ctx: HDD context
- * @wdev: Wireless device structure
- * @status: Status of conditional channel switch
- * (0: Success, Non-zero: Failure)
- *
- * Sends the status of conditional channel switch to user space. This is named
- * conditional channel switch because the SAP will move to the provided channel
- * after some condition (pre-cac) is met.
- *
- * Return: None
- */
-void hdd_send_conditional_chan_switch_status(struct hdd_context *hdd_ctx,
-					     struct wireless_dev *wdev,
-					     bool status);
-
 /**
  * hdd_close_pre_cac_adapter() - Close pre CAC adapter
  * @hdd_ctx: the HDD context to operate against
@@ -105,11 +43,6 @@ void hdd_send_conditional_chan_switch_status(struct hdd_context *hdd_ctx,
  */
 void hdd_close_pre_cac_adapter(struct hdd_context *hdd_ctx);
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifdef PRE_CAC_COMP
 /**
  * hdd_pre_cac_register_cb() - Sets legacy callbacks to osif
  *
@@ -128,48 +61,12 @@ QDF_STATUS hdd_pre_cac_register_cb(void);
  */
 void hdd_pre_cac_unregister_cb(void);
 #else
-static inline QDF_STATUS hdd_pre_cac_register_cb(void)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
-static inline void hdd_pre_cac_unregister_cb(void)
-{
-}
-#endif /* PRE_CAC_COMP */
-#else
-static inline void wlan_hdd_sap_pre_cac_success(void *data)
-{
-}
-
-static inline void wlan_hdd_sap_pre_cac_failure(void *data)
-{
-}
-
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-static inline void
-hdd_clean_up_pre_cac_interface(struct hdd_context *hdd_ctx)
-{
-}
-#endif
-
 static inline int
 wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx, uint32_t chan_freq)
 {
 	return 0;
 }
 
-static inline void
-hdd_send_conditional_chan_switch_status(struct hdd_context *hdd_ctx,
-					struct wireless_dev *wdev,
-					bool status)
-{
-}
-
 static inline void
 hdd_close_pre_cac_adapter(struct hdd_context *hdd_ctx)
 {

core/hdd/src/wlan_hdd_hostapd.c

@@ -2246,39 +2246,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		hdd_son_deliver_cac_status_event(adapter, true);
 		break;
 	}
-/*
- * The code under this macro will be removed
- * once pre_cac componentization is done
- */
-#if defined(PRE_CAC_SUPPORT) && !defined(PRE_CAC_COMP)
-	case eSAP_DFS_RADAR_DETECT_DURING_PRE_CAC:
-		hdd_debug("notification for radar detect during pre cac:%d",
-			adapter->vdev_id);
-		hdd_send_conditional_chan_switch_status(hdd_ctx,
-			&adapter->wdev, false);
-		hdd_ctx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE;
-		qdf_create_work(0, &hdd_ctx->sap_pre_cac_work,
-				wlan_hdd_sap_pre_cac_failure,
-				(void *)adapter);
-		qdf_sched_work(0, &hdd_ctx->sap_pre_cac_work);
-		hdd_son_deliver_cac_status_event(adapter, true);
-		break;
-	case eSAP_DFS_PRE_CAC_END:
-		hdd_debug("pre cac end notification received:%d",
-			adapter->vdev_id);
-		hdd_send_conditional_chan_switch_status(hdd_ctx,
-			&adapter->wdev, true);
-		ap_ctx->dfs_cac_block_tx = false;
-		ucfg_ipa_set_dfs_cac_tx(hdd_ctx->pdev,
-					ap_ctx->dfs_cac_block_tx);
-		hdd_ctx->dev_dfs_cac_status = DFS_CAC_ALREADY_DONE;
 
-		qdf_create_work(0, &hdd_ctx->sap_pre_cac_work,
-				wlan_hdd_sap_pre_cac_success,
-				(void *)adapter);
-		qdf_sched_work(0, &hdd_ctx->sap_pre_cac_work);
-		break;
-#endif /* PRE_CAC_SUPPORT and PRE_CAC_COMP */
 	case eSAP_DFS_NO_AVAILABLE_CHANNEL:
 		wlan_hdd_send_svc_nlink_msg
 			(hdd_ctx->radio_index,
@@ -6678,17 +6646,9 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 	mutex_unlock(&hdd_ctx->sap_lock);
 
 	mac_handle = hdd_ctx->mac_handle;
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	if (wlan_sap_is_pre_cac_active(mac_handle))
-		hdd_clean_up_pre_cac_interface(hdd_ctx);
-#else
+
 	if (ucfg_pre_cac_is_active(hdd_ctx->psoc))
 		ucfg_pre_cac_clean_up(hdd_ctx->psoc);
-#endif
 
 	if (status != QDF_STATUS_SUCCESS) {
 		hdd_err("Stopping the BSS");

core/hdd/src/wlan_hdd_main.c

@@ -7941,16 +7941,6 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx,
 
 	hdd_periodic_sta_stats_init(adapter);
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	adapter->is_pre_cac_adapter = false;
-#else
-	ucfg_pre_cac_adapter_set(adapter->vdev, false);
-#endif
-
 	return adapter;
 
 err_destroy_adapter_features_update_work:
@@ -8355,28 +8345,6 @@ QDF_STATUS hdd_stop_adapter_ext(struct hdd_context *hdd_ctx,
 
 		ucfg_ipa_flush(hdd_ctx->pdev);
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-		if (!adapter->is_pre_cac_adapter) {
-			/**
-			 * don't flush pre-cac destroy if we are destroying
-			 * pre-cac adapter
-			 */
-			sap_ctx = WLAN_HDD_GET_SAP_CTX_PTR(adapter);
-
-			if (!wlan_sap_is_pre_cac_context(sap_ctx) &&
-			    (hdd_ctx->sap_pre_cac_work.fn))
-				cds_flush_work(&hdd_ctx->sap_pre_cac_work);
-			hdd_close_pre_cac_adapter(hdd_ctx);
-		} else {
-			if (wlan_sap_set_pre_cac_status(
-				   WLAN_HDD_GET_SAP_CTX_PTR(adapter), false))
-				hdd_err("Failed to set is_pre_cac_on to false");
-		}
-#else
 		if (!ucfg_pre_cac_adapter_is_active(adapter->vdev)) {
 			/**
 			 * don't flush pre-cac destroy if we are destroying
@@ -8390,7 +8358,7 @@ QDF_STATUS hdd_stop_adapter_ext(struct hdd_context *hdd_ctx,
 			if (ucfg_pre_cac_set_status(adapter->vdev, false))
 				hdd_err("Failed to set is_pre_cac_on to false");
 		}
-#endif
+
 		fallthrough;
 
 	case QDF_P2P_GO_MODE:
@@ -8570,17 +8538,7 @@ QDF_STATUS hdd_stop_all_adapters(struct hdd_context *hdd_ctx)
 
 	hdd_enter();
 
-/*
- * The code under this macro will be removed
- * once pre_cac componentization is done
- */
-#ifndef PRE_CAC_COMP
-	if (hdd_ctx->sap_pre_cac_work.fn)
-		cds_flush_work(&hdd_ctx->sap_pre_cac_work);
-#else
 	ucfg_pre_cac_stop(hdd_ctx->psoc);
-#endif
-
 	hdd_for_each_adapter_dev_held_safe(hdd_ctx, adapter, next_adapter,
 					   NET_DEV_HOLD_STOP_ALL_ADAPTERS) {
 		hdd_stop_adapter(hdd_ctx, adapter);

core/hdd/src/wlan_hdd_p2p.c

@@ -941,21 +941,10 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
 	if (errno)
 		return errno;
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	if (adapter->device_mode == QDF_SAP_MODE &&
-	    wlan_sap_is_pre_cac_active(hdd_ctx->mac_handle)) {
-		hdd_clean_up_interface(hdd_ctx, adapter);
-		hdd_clean_up_pre_cac_interface(hdd_ctx);
-#else
 	if (adapter->device_mode == QDF_SAP_MODE &&
 	    ucfg_pre_cac_is_active(hdd_ctx->psoc)) {
 		hdd_clean_up_interface(hdd_ctx, adapter);
 		ucfg_pre_cac_clean_up(hdd_ctx->psoc);
-#endif
 	} else if (wlan_hdd_is_session_type_monitor(
 					adapter->device_mode) &&
 		   ucfg_pkt_capture_get_mode(hdd_ctx->psoc) !=

core/hdd/src/wlan_hdd_pre_cac.c

@@ -24,67 +24,6 @@
 #include "wlan_ipa_ucfg_api.h"
 #include "wlan_hdd_son.h"
 
-void hdd_send_conditional_chan_switch_status(struct hdd_context *hdd_ctx,
-					     struct wireless_dev *wdev,
-					     bool status)
-{
-	struct sk_buff *event;
-
-	hdd_enter_dev(wdev->netdev);
-
-	if (!hdd_ctx) {
-		hdd_err("Invalid HDD context pointer");
-		return;
-	}
-
-	event = cfg80211_vendor_event_alloc(hdd_ctx->wiphy,
-		  wdev, sizeof(uint32_t) + NLMSG_HDRLEN,
-		  QCA_NL80211_VENDOR_SUBCMD_SAP_CONDITIONAL_CHAN_SWITCH_INDEX,
-		  GFP_KERNEL);
-	if (!event) {
-		hdd_err("cfg80211_vendor_event_alloc failed");
-		return;
-	}
-
-	if (nla_put_u32(event,
-			QCA_WLAN_VENDOR_ATTR_SAP_CONDITIONAL_CHAN_SWITCH_STATUS,
-			status)) {
-		hdd_err("nla put failed");
-		kfree_skb(event);
-		return;
-	}
-
-	cfg80211_vendor_event(event, GFP_KERNEL);
-}
-
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-/**
- * wlan_hdd_set_pre_cac_complete_status() - Set pre cac complete status
- * @ap_adapter: AP adapter
- * @status: Status which can be true or false
- *
- * Sets the status of pre cac i.e., whether it is complete or not
- *
- * Return: Zero on success, non-zero on failure
- */
-static int wlan_hdd_set_pre_cac_complete_status(struct hdd_adapter *ap_adapter,
-						bool status)
-{
-	QDF_STATUS ret;
-
-	ret = wlan_sap_set_pre_cac_complete_status(
-			WLAN_HDD_GET_SAP_CTX_PTR(ap_adapter), status);
-	if (QDF_IS_STATUS_ERROR(ret))
-		return -EINVAL;
-
-	return 0;
-}
-#endif
-
 /**
  * __wlan_hdd_sap_pre_cac_failure() - Process the pre cac failure
  * @adapter: AP adapter
@@ -93,15 +32,7 @@ static int wlan_hdd_set_pre_cac_complete_status(struct hdd_adapter *ap_adapter,
  *
  * Return: None
  */
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-static void __wlan_hdd_sap_pre_cac_failure(struct hdd_adapter *adapter)
-#else
 static void wlan_hdd_pre_cac_failure(struct hdd_adapter *adapter)
-#endif
 {
 	struct hdd_context *hdd_ctx;
 
@@ -116,34 +47,6 @@ static void wlan_hdd_pre_cac_failure(struct hdd_adapter *adapter)
 	hdd_exit();
 }
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-/**
- * wlan_hdd_sap_pre_cac_failure() - Process the pre cac failure
- * @data: AP adapter
- *
- * Deletes the pre cac adapter
- *
- * Return: None
- */
-void wlan_hdd_sap_pre_cac_failure(void *data)
-{
-	struct hdd_adapter *adapter = data;
-	struct osif_vdev_sync *vdev_sync;
-	int errno;
-
-	errno = osif_vdev_sync_trans_start_wait(adapter->dev, &vdev_sync);
-	if (errno)
-		return;
-
-	__wlan_hdd_sap_pre_cac_failure(data);
-
-	osif_vdev_sync_trans_stop(vdev_sync);
-}
-
 /**
  * __wlan_hdd_sap_pre_cac_success() - Process the pre cac result
  * @adapter: AP adapter
@@ -153,10 +56,7 @@ void wlan_hdd_sap_pre_cac_failure(void *data)
  *
  * Return: None
  */
-static void __wlan_hdd_sap_pre_cac_success(struct hdd_adapter *adapter)
-#else
 static void wlan_hdd_pre_cac_success(struct hdd_adapter *adapter)
-#endif
 {
 	struct hdd_adapter *ap_adapter;
 	int i;
@@ -183,28 +83,7 @@ static void wlan_hdd_pre_cac_success(struct hdd_adapter *adapter)
 		hdd_err("failed to get SAP adapter, no restart on pre CAC channel");
 		return;
 	}
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	/*
-	 * Setting of the pre cac complete status will ensure that on channel
-	 * switch to the pre CAC DFS channel, there is no CAC again.
-	 */
-	wlan_hdd_set_pre_cac_complete_status(ap_adapter, true);
 
-	wlan_hdd_set_sap_csa_reason(hdd_ctx->psoc, ap_adapter->vdev_id,
-				    CSA_REASON_PRE_CAC_SUCCESS);
-	chan_freq = ap_adapter->pre_cac_freq;
-	i = hdd_softap_set_channel_change(ap_adapter->dev,
-					  chan_freq,
-					  pre_cac_ch_width, false);
-	if (i) {
-		hdd_err("failed to change channel");
-		wlan_hdd_set_pre_cac_complete_status(ap_adapter, false);
-	}
-#else
 	/*
 	 * Setting of the pre cac complete status will ensure that on channel
 	 * switch to the pre CAC DFS channel, there is no CAC again.
@@ -221,32 +100,10 @@ static void wlan_hdd_pre_cac_success(struct hdd_adapter *adapter)
 		hdd_err("failed to change channel");
 		ucfg_pre_cac_complete_set(ap_adapter->vdev, false);
 	}
-#endif
 
 	hdd_exit();
 }
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-void wlan_hdd_sap_pre_cac_success(void *data)
-{
-	struct hdd_adapter *adapter = data;
-	struct osif_vdev_sync *vdev_sync;
-	int errno;
-
-	errno = osif_vdev_sync_trans_start_wait(adapter->dev, &vdev_sync);
-	if (errno)
-		return;
-
-	__wlan_hdd_sap_pre_cac_success(adapter);
-
-	osif_vdev_sync_trans_stop(vdev_sync);
-}
-#endif /* PRE_CAC_COMP */
-
 void hdd_close_pre_cac_adapter(struct hdd_context *hdd_ctx)
 {
 	struct hdd_adapter *pre_cac_adapter;
@@ -273,68 +130,6 @@ void hdd_close_pre_cac_adapter(struct hdd_context *hdd_ctx)
 	osif_vdev_sync_destroy(vdev_sync);
 }
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-void hdd_clean_up_pre_cac_interface(struct hdd_context *hdd_ctx)
-{
-	uint8_t vdev_id;
-	QDF_STATUS status;
-	struct hdd_adapter *precac_adapter;
-
-	status = wlan_sap_get_pre_cac_vdev_id(hdd_ctx->mac_handle, &vdev_id);
-	if (QDF_IS_STATUS_ERROR(status)) {
-		hdd_err("failed to get pre cac vdev id");
-		return;
-	}
-
-	precac_adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
-	if (!precac_adapter) {
-		hdd_err("invalid pre cac adapter");
-		return;
-	}
-
-	qdf_create_work(0, &hdd_ctx->sap_pre_cac_work,
-			wlan_hdd_sap_pre_cac_failure,
-			(void *)precac_adapter);
-	qdf_sched_work(0, &hdd_ctx->sap_pre_cac_work);
-}
-#endif
-
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-/**
- * wlan_hdd_set_chan_freq_before_pre_cac() - Save the channel before pre cac
- * @ap_adapter: AP adapter
- * @freq_before_pre_cac: Channel
- *
- * Saves the channel frequency which the AP was beaconing on before moving to
- * the pre cac channel. If radar is detected on the pre cac channel, this saved
- * channel will be used for AP operations.
- *
- * Return: Zero on success, non-zero on failure
- */
-static int
-wlan_hdd_set_chan_freq_before_pre_cac(struct hdd_adapter *ap_adapter,
-				      qdf_freq_t freq_before_pre_cac)
-{
-	QDF_STATUS ret;
-	struct sap_context *sap_ctx = WLAN_HDD_GET_SAP_CTX_PTR(ap_adapter);
-
-	ret = wlan_sap_set_chan_freq_before_pre_cac(sap_ctx,
-						    freq_before_pre_cac);
-	if (QDF_IS_STATUS_ERROR(ret))
-		return -EINVAL;
-
-	return 0;
-}
-#endif
-
 static int wlan_set_def_pre_cac_chan(struct hdd_context *hdd_ctx,
 				     uint32_t pre_cac_ch_freq,
 				     struct cfg80211_chan_def *chandef,
@@ -397,105 +192,6 @@ static int wlan_set_def_pre_cac_chan(struct hdd_context *hdd_ctx,
 	return 0;
 }
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-/**
- * wlan_hdd_validate_and_get_pre_cac_ch() - Validate and get pre cac channel
- * @hdd_ctx: HDD context
- * @ap_adapter: AP adapter
- * @chan_freq: Channel frequency requested by userspace
- * @pre_cac_chan_freq: Pointer to the pre CAC channel frequency storage
- *
- * Validates the channel provided by userspace. If user provided channel 0,
- * a valid outdoor channel must be selected from the regulatory channel.
- *
- * Return: Zero on success and non zero value on error
- */
-static int wlan_hdd_validate_and_get_pre_cac_ch(struct hdd_context *hdd_ctx,
-						struct hdd_adapter *ap_adapter,
-						uint32_t chan_freq,
-						uint32_t *pre_cac_chan_freq)
-{
-	uint32_t i;
-	QDF_STATUS status;
-	uint32_t weight_len = 0;
-	uint32_t len = CFG_VALID_CHANNEL_LIST_LEN;
-	uint32_t freq_list[NUM_CHANNELS] = {0};
-	uint8_t pcl_weights[NUM_CHANNELS] = {0};
-	mac_handle_t mac_handle;
-
-	if (!chan_freq) {
-		/* Channel is not obtained from PCL because PCL may not have
-		 * the entire channel list. For example: if SAP is up on
-		 * channel 6 and PCL is queried for the next SAP interface,
-		 * if SCC is preferred, the PCL will contain only the channel
-		 * 6. But, we are in need of a DFS channel. So, going with the
-		 * first channel from the valid channel list.
-		 */
-		status = policy_mgr_get_valid_chans(hdd_ctx->psoc,
-						    freq_list, &len);
-		if (QDF_IS_STATUS_ERROR(status)) {
-			hdd_err("Failed to get channel list");
-			return -EINVAL;
-		}
-		policy_mgr_update_with_safe_channel_list(hdd_ctx->psoc,
-							 freq_list, &len,
-							 pcl_weights,
-							 weight_len);
-		for (i = 0; i < len; i++) {
-			if (wlan_reg_is_dfs_for_freq(hdd_ctx->pdev,
-						     freq_list[i])) {
-				*pre_cac_chan_freq = freq_list[i];
-				break;
-			}
-		}
-		if (*pre_cac_chan_freq == 0) {
-			hdd_err("unable to find outdoor channel");
-			return -EINVAL;
-		}
-	} else {
-		/* Only when driver selects a channel, check is done for
-		 * unnsafe and NOL channels. When user provides a fixed channel
-		 * the user is expected to take care of this.
-		 */
-		mac_handle = hdd_ctx->mac_handle;
-		if (!sme_is_channel_valid(mac_handle, chan_freq) ||
-		    !wlan_reg_is_dfs_for_freq(hdd_ctx->pdev, chan_freq)) {
-			hdd_err("Invalid channel for pre cac:%d", chan_freq);
-			return -EINVAL;
-		}
-		*pre_cac_chan_freq = chan_freq;
-	}
-	hdd_debug("selected pre cac channel:%d", *pre_cac_chan_freq);
-	return 0;
-}
-
-/**
- * wlan_hdd_set_pre_cac_status() - Set the pre cac status
- * @pre_cac_adapter: AP adapter used for pre cac
- * @status: Status (true or false)
- *
- * Sets the status of pre cac i.e., whether the pre cac is active or not
- *
- * Return: Zero on success, non-zero on failure
- */
-static int wlan_hdd_set_pre_cac_status(struct hdd_adapter *pre_cac_adapter,
-				       bool status)
-{
-	QDF_STATUS ret;
-
-	ret = wlan_sap_set_pre_cac_status(
-		WLAN_HDD_GET_SAP_CTX_PTR(pre_cac_adapter), status);
-	if (QDF_IS_STATUS_ERROR(ret))
-		return -EINVAL;
-
-	return 0;
-}
-#endif
-
 /**
  * __wlan_hdd_request_pre_cac() - Start pre CAC in the driver
  * @hdd_ctx: the HDD context to operate against
@@ -522,14 +218,6 @@ static int __wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx,
 	struct cfg80211_chan_def chandef;
 	enum nl80211_channel_type channel_type;
 	mac_handle_t mac_handle;
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	bool val;
-	qdf_freq_t freq;
-#endif
 	enum phy_ch_width cac_ch_width;
 	struct hdd_adapter_create_param params = {0};
 
@@ -540,28 +228,11 @@ static int __wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx,
 
 	pre_cac_adapter = hdd_get_adapter_by_iface_name(hdd_ctx,
 							SAP_PRE_CAC_IFNAME);
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	if (pre_cac_adapter) {
-		/* Flush existing pre_cac work */
-		if (hdd_ctx->sap_pre_cac_work.fn)
-			cds_flush_work(&hdd_ctx->sap_pre_cac_work);
-	} else {
-		if (policy_mgr_get_connection_count(hdd_ctx->psoc) > 1) {
-			hdd_err("pre cac not allowed in concurrency");
-			return -EINVAL;
-		}
-	}
-#else
 	if (!pre_cac_adapter &&
 	    (policy_mgr_get_connection_count(hdd_ctx->psoc) > 1)) {
 		hdd_err("pre cac not allowed in concurrency");
 		return -EINVAL;
 	}
-#endif
 
 	ap_adapter = hdd_get_adapter(hdd_ctx, QDF_SAP_MODE);
 	if (!ap_adapter) {
@@ -575,17 +246,6 @@ static int __wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx,
 	}
 
 	mac_handle = hdd_ctx->mac_handle;
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	val = wlan_sap_is_pre_cac_active(mac_handle);
-	if (val) {
-		hdd_err("pre cac is already in progress");
-		return -EINVAL;
-	}
-#endif
 
 	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
 	if (!hdd_ap_ctx) {
@@ -608,17 +268,8 @@ static int __wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx,
 
 	hdd_debug("channel: %d", chan_freq);
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	ret = wlan_hdd_validate_and_get_pre_cac_ch(
-		hdd_ctx, ap_adapter, chan_freq, &pre_cac_chan_freq);
-#else
 	ret = ucfg_pre_cac_validate_and_get_freq(hdd_ctx->pdev, chan_freq,
 						 &pre_cac_chan_freq);
-#endif
 	if (ret != 0) {
 		hdd_err("can't validate pre-cac channel");
 		goto release_intf_addr_and_return_failure;
@@ -760,28 +411,6 @@ static int __wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx,
 	 * anywhere, since after the pre cac success/failure, the pre cac
 	 * adapter itself would be removed.
 	 */
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	ret = wlan_hdd_set_pre_cac_status(pre_cac_adapter, true);
-	if (ret != 0) {
-		hdd_err("failed to set pre cac status");
-		goto stop_close_pre_cac_adapter;
-	}
-
-	freq = hdd_ap_ctx->operating_chan_freq;
-	ret = wlan_hdd_set_chan_freq_before_pre_cac(ap_adapter,
-						    freq);
-	if (ret != 0) {
-		hdd_err("failed to set channel before pre cac");
-		goto stop_close_pre_cac_adapter;
-	}
-
-	ap_adapter->pre_cac_freq = pre_cac_chan_freq;
-	pre_cac_adapter->is_pre_cac_adapter = true;
-#else
 	ret = ucfg_pre_cac_set_status(pre_cac_adapter->vdev, true);
 	if (ret != 0) {
 		hdd_err("failed to set pre cac status");
@@ -792,7 +421,6 @@ static int __wlan_hdd_request_pre_cac(struct hdd_context *hdd_ctx,
 					     hdd_ap_ctx->operating_chan_freq);
 	ucfg_pre_cac_set_freq(ap_adapter->vdev, pre_cac_chan_freq);
 	ucfg_pre_cac_adapter_set(pre_cac_adapter->vdev, true);
-#endif
 	*out_adapter = pre_cac_adapter;
 
 	return 0;
@@ -878,11 +506,6 @@ destroy_sync:
 	return errno;
 }
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifdef PRE_CAC_COMP
 static void
 wlan_hdd_pre_cac_conditional_freq_switch_ind(struct wlan_objmgr_vdev *vdev,
 					     bool completed)
@@ -947,4 +570,3 @@ void hdd_pre_cac_unregister_cb(void)
 {
 	osif_pre_cac_reset_legacy_cb();
 }
-#endif /* PRE_CAC_COMP */

core/sap/inc/sap_api.h

@@ -161,15 +161,7 @@ typedef enum {
 	eSAP_DFS_CAC_START,
 	eSAP_DFS_CAC_INTERRUPTED,
 	eSAP_DFS_CAC_END,
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	eSAP_DFS_PRE_CAC_END,
-#endif
 	eSAP_DFS_RADAR_DETECT,
-	eSAP_DFS_RADAR_DETECT_DURING_PRE_CAC,
 	/* No ch available after DFS RADAR detect */
 	eSAP_DFS_NO_AVAILABLE_CHANNEL,
 	eSAP_STOP_BSS_DUE_TO_NO_CHNL,
@@ -861,107 +853,6 @@ QDF_STATUS wlan_sap_update_next_channel(struct sap_context *sap_ctx,
 					uint8_t channel,
 					enum phy_ch_width chan_bw);
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-#if defined(FEATURE_SAP_COND_CHAN_SWITCH) && defined(PRE_CAC_SUPPORT)
-/**
- * wlan_sap_set_pre_cac_status() - Set the pre cac status
- * @sap_ctx: SAP context
- * @status: Status of pre cac
- *
- * Updates the state of pre cac in the SAP context
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS wlan_sap_set_pre_cac_status(struct sap_context *sap_ctx,
-				       bool status);
-
-/**
- * wlan_sap_set_chan_freq_before_pre_cac() - Save the channel before pre cac
- * @sap_ctx: SAP context
- * @freq_before_pre_cac: Channel frequency before pre cac
- *
- * Saves the channel frequency that was in use before pre cac operation
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS
-wlan_sap_set_chan_freq_before_pre_cac(struct sap_context *sap_ctx,
-				      qdf_freq_t freq_before_pre_cac);
-#else
-static inline QDF_STATUS
-wlan_sap_set_pre_cac_status(struct sap_context *sap_ctx, bool status)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
-static inline QDF_STATUS
-wlan_sap_set_chan_freq_before_pre_cac(struct sap_context *sap_ctx,
-				      qdf_freq_t freq_before_pre_cac)
-{
-	return QDF_STATUS_SUCCESS;
-}
-#endif /* FEATURE_SAP_COND_CHAN_SWITCH and PRE_CAC_SUPPORT */
-#endif /* PRE_CAC_COMP */
-
-#ifdef PRE_CAC_SUPPORT
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-/**
- * wlan_sap_set_pre_cac_complete_status() - Sets pre cac complete status
- * @sap_ctx: SAP context
- * @status: Status of pre cac complete
- *
- * Sets the status of pre cac i.e., whether pre cac is complete or not
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS wlan_sap_set_pre_cac_complete_status(struct sap_context *sap_ctx,
-						bool status);
-
-/**
- * wlan_sap_is_pre_cac_context() - checks if @context is for a pre-cac adapter
- * @context: the SAP context to check
- *
- * Return: true if @context is for a pre-cac adapter
- */
-bool wlan_sap_is_pre_cac_context(struct sap_context *context);
-
-bool wlan_sap_is_pre_cac_active(mac_handle_t handle);
-QDF_STATUS wlan_sap_get_pre_cac_vdev_id(mac_handle_t handle, uint8_t *vdev_id);
-#endif
-#else
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-static inline QDF_STATUS
-wlan_sap_set_pre_cac_complete_status(struct sap_context *sap_ctx,
-				     bool status)
-{
-	return QDF_STATUS_SUCCESS;
-}
-
-static inline bool
-wlan_sap_is_pre_cac_context(struct sap_context *context)
-{
-	return false;
-}
-
-static inline bool wlan_sap_is_pre_cac_active(mac_handle_t handle)
-{
-	return false;
-}
-#endif /* PRE_CAC_COMP */
-#endif /* PRE_CAC_SUPPORT */
-
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 /**
  * wlansap_check_cc_intf() - Get interfering concurrent channel

core/sap/src/sap_api_link_cntl.c

@@ -477,15 +477,7 @@ wlansap_roam_process_ch_change_success(struct mac_context *mac_ctx,
 
 	sap_ctx->chan_freq = target_chan_freq;
 	/* check if currently selected channel is a DFS channel */
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	if (is_ch_dfs && sap_ctx->pre_cac_complete) {
-#else
 	if (is_ch_dfs && wlan_pre_cac_complete_get(sap_ctx->vdev)) {
-#endif
 		/* Start beaconing on the new pre cac channel */
 		wlansap_start_beacon_req(sap_ctx);
 		sap_ctx->fsm_state = SAP_STARTING;
@@ -562,15 +554,7 @@ wlansap_roam_process_dfs_chansw_update(mac_handle_t mac_handle,
 		 * with no CSA IE will be sent to firmware.
 		 */
 		dfs_beacon_start_req = true;
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-		sap_ctx->pre_cac_complete = false;
-#else
 		wlan_pre_cac_complete_set(sap_ctx->vdev, false);
-#endif
 		*ret_status = sme_roam_start_beacon_req(mac_handle,
 							sap_ctx->bssid,
 							dfs_beacon_start_req);
@@ -1016,28 +1000,6 @@ static bool sap_is_csa_restart_state(struct wlan_objmgr_psoc *psoc,
 }
 
 #ifdef PRE_CAC_SUPPORT
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-static void wlan_sap_pre_cac_radar_ind(struct sap_context *sap_ctx,
-				       struct mac_context *mac_ctx)
-{
-	qdf_mc_timer_t *dfs_timer = &mac_ctx->sap.SapDfsInfo.sap_dfs_cac_timer;
-
-	sap_debug("sapdfs: Radar detect on pre cac:%d", sap_ctx->sessionId);
-	if (!sap_ctx->dfs_cac_offload) {
-		qdf_mc_timer_stop(dfs_timer);
-		qdf_mc_timer_destroy(dfs_timer);
-	}
-
-	mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running = false;
-	sap_signal_hdd_event(sap_ctx, NULL,
-			     eSAP_DFS_RADAR_DETECT_DURING_PRE_CAC,
-			     (void *)eSAP_STATUS_SUCCESS);
-}
-#else
 static void wlan_sap_pre_cac_radar_ind(struct sap_context *sap_ctx,
 				       struct mac_context *mac_ctx)
 {
@@ -1052,7 +1014,6 @@ static void wlan_sap_pre_cac_radar_ind(struct sap_context *sap_ctx,
 	mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running = false;
 	wlan_pre_cac_handle_radar_ind(sap_ctx->vdev);
 }
-#endif /* PRE_CAC_COMP */
 #else
 static inline void
 wlan_sap_pre_cac_radar_ind(struct sap_context *sap_ctx,
@@ -1164,21 +1125,12 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 				  sap_ctx->chan_freq);
 			goto EXIT;
 		}
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-		if (sap_ctx->is_pre_cac_on) {
-			wlan_sap_pre_cac_radar_ind(sap_ctx, mac_ctx);
-			break;
-		}
-#else
+
 		if (wlan_pre_cac_get_status(mac_ctx->psoc)) {
 			wlan_sap_pre_cac_radar_ind(sap_ctx, mac_ctx);
 			break;
 		}
-#endif
+
 		sap_debug("sapdfs: Indicate eSAP_DFS_RADAR_DETECT to HDD");
 		sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_RADAR_DETECT,
 				     (void *) eSAP_STATUS_SUCCESS);

core/sap/src/sap_fsm.c

@@ -155,15 +155,7 @@ static uint8_t *sap_hdd_event_to_string(eSapHddEvent event)
 	CASE_RETURN_STRING(eSAP_DFS_CAC_START);
 	CASE_RETURN_STRING(eSAP_DFS_CAC_INTERRUPTED);
 	CASE_RETURN_STRING(eSAP_DFS_CAC_END);
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	CASE_RETURN_STRING(eSAP_DFS_PRE_CAC_END);
-#endif
 	CASE_RETURN_STRING(eSAP_DFS_RADAR_DETECT);
-	CASE_RETURN_STRING(eSAP_DFS_RADAR_DETECT_DURING_PRE_CAC);
 	CASE_RETURN_STRING(eSAP_DFS_NO_AVAILABLE_CHANNEL);
 #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
 	CASE_RETURN_STRING(eSAP_ACS_SCAN_SUCCESS_EVENT);
@@ -530,32 +522,13 @@ is_wlansap_cac_required_for_chan(struct mac_context *mac_ctx,
 	if (WLAN_REG_IS_6GHZ_CHAN_FREQ(chan_freq))
 		is_ch_dfs = false;
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	sap_debug("vdev id %d chan %d is_ch_dfs %d pre_cac_complete %d ignore_cac %d cac_state %d",
-		  sap_ctx->sessionId, chan_freq, is_ch_dfs,
-		  sap_ctx->pre_cac_complete, mac_ctx->sap.SapDfsInfo.ignore_cac,
-		  mac_ctx->sap.SapDfsInfo.cac_state);
-#else
 	sap_debug("vdev id %d chan %d is_ch_dfs %d pre_cac_complete %d ignore_cac %d cac_state %d",
 		  sap_ctx->sessionId, chan_freq, is_ch_dfs,
 		  wlan_pre_cac_complete_get(sap_ctx->vdev),
 		  mac_ctx->sap.SapDfsInfo.ignore_cac,
 		  mac_ctx->sap.SapDfsInfo.cac_state);
-#endif
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	if (!is_ch_dfs || sap_ctx->pre_cac_complete ||
-#else
 	if (!is_ch_dfs || wlan_pre_cac_complete_get(sap_ctx->vdev) ||
-#endif
 	    mac_ctx->sap.SapDfsInfo.ignore_cac ||
 	    mac_ctx->sap.SapDfsInfo.cac_state == eSAP_DFS_SKIP_CAC)
 		cac_required = false;
@@ -1505,19 +1478,9 @@ QDF_STATUS sap_set_session_param(mac_handle_t mac_handle,
 	int i;
 
 	sapctx->sessionId = session_id;
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	sapctx->is_pre_cac_on = false;
-	sapctx->pre_cac_complete = false;
-	sapctx->freq_before_pre_cac = 0;
-#else
 	wlan_pre_cac_set_status(sapctx->vdev, false);
 	wlan_pre_cac_complete_set(sapctx->vdev, false);
 	wlan_pre_cac_set_freq_before_pre_cac(sapctx->vdev, 0);
-#endif
 
 	/* When SSR, SAP will restart, clear the old context,sessionId */
 	for (i = 0; i < SAP_MAX_NUM_SESSION; i++) {
@@ -2286,15 +2249,7 @@ QDF_STATUS sap_signal_hdd_event(struct sap_context *sap_ctx,
 	case eSAP_DFS_CAC_START:
 	case eSAP_DFS_CAC_INTERRUPTED:
 	case eSAP_DFS_CAC_END:
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	case eSAP_DFS_PRE_CAC_END:
-#endif
 	case eSAP_DFS_RADAR_DETECT:
-	case eSAP_DFS_RADAR_DETECT_DURING_PRE_CAC:
 	case eSAP_DFS_NO_AVAILABLE_CHANNEL:
 		sap_ap_event->sapHddEventCode = sap_hddevent;
 		sap_ap_event->sapevt.sapStopBssCompleteEvent.status =
@@ -2742,42 +2697,6 @@ static QDF_STATUS sap_cac_start_notify(mac_handle_t mac_handle)
 }
 
 #ifdef PRE_CAC_SUPPORT
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-/**
- * wlansap_update_pre_cac_end() - Update pre cac end to upper layer
- * @sap_context: SAP context
- * @mac: Global MAC structure
- * @intf: Interface number
- *
- * Notifies pre cac end to upper layer
- *
- * Return: QDF_STATUS
- */
-static QDF_STATUS wlansap_update_pre_cac_end(struct sap_context *sap_context,
-		struct mac_context *mac, uint8_t intf)
-{
-	QDF_STATUS qdf_status;
-
-	sap_context->isCacEndNotified = true;
-	mac->sap.SapDfsInfo.sap_radar_found_status = false;
-	sap_context->fsm_state = SAP_STARTED;
-
-	sap_warn("pre cac end notify on %d: move to state SAP_STARTED", intf);
-	qdf_status = sap_signal_hdd_event(sap_context,
-			NULL, eSAP_DFS_PRE_CAC_END,
-			(void *)eSAP_STATUS_SUCCESS);
-	if (QDF_IS_STATUS_ERROR(qdf_status)) {
-		sap_err("pre cac notify failed on intf %d", intf);
-		return qdf_status;
-	}
-
-	return QDF_STATUS_SUCCESS;
-}
-#else
 /**
  * wlansap_pre_cac_end_notify() - Update pre cac end to upper layer
  * @sap_context: SAP context
@@ -2799,7 +2718,6 @@ static void wlansap_pre_cac_end_notify(struct sap_context *sap_context,
 	sap_warn("pre cac end notify on %d: move to state SAP_STARTED", intf);
 	wlan_pre_cac_handle_cac_end(sap_context->vdev);
 }
-#endif /* PRE_CAC_COMP */
 
 QDF_STATUS sap_cac_end_notify(mac_handle_t mac_handle,
 			      struct csr_roam_info *roamInfo)
@@ -2836,22 +2754,6 @@ QDF_STATUS sap_cac_end_notify(mac_handle_t mac_handle,
 			 * temporary interface created for pre cac and switch
 			 * the original SAP to the pre CAC channel.
 			 */
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-			if (sap_context->is_pre_cac_on) {
-				qdf_status = wlansap_update_pre_cac_end(
-						sap_context, mac, intf);
-				if (QDF_IS_STATUS_ERROR(qdf_status))
-					return qdf_status;
-				/* pre CAC is not allowed with any concurrency.
-				 * So, we can break from here.
-				 */
-				break;
-			}
-#else
 			if (wlan_pre_cac_get_status(mac->psoc)) {
 				wlansap_pre_cac_end_notify(sap_context,
 							   mac, intf);
@@ -2860,7 +2762,6 @@ QDF_STATUS sap_cac_end_notify(mac_handle_t mac_handle,
 				 */
 				break;
 			}
-#endif
 
 			qdf_status = sap_signal_hdd_event(sap_context, NULL,
 							  eSAP_DFS_CAC_END,
@@ -3546,15 +3447,7 @@ static QDF_STATUS sap_fsm_state_starting(struct sap_context *sap_ctx,
 			if ((false == sap_dfs_info->ignore_cac) &&
 			    (eSAP_DFS_DO_NOT_SKIP_CAC ==
 			    sap_dfs_info->cac_state) &&
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-			    !sap_ctx->pre_cac_complete &&
-#else
 			    !wlan_pre_cac_complete_get(sap_ctx->vdev) &&
-#endif
 			    policy_mgr_get_dfs_master_dynamic_enabled(
 					mac_ctx->psoc,
 					sap_ctx->sessionId)) {
@@ -4343,24 +4236,12 @@ qdf_freq_t sap_indicate_radar(struct sap_context *sap_ctx)
 	/* set the Radar Found flag in SapDfsInfo */
 	mac->sap.SapDfsInfo.sap_radar_found_status = true;
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	if (sap_ctx->freq_before_pre_cac) {
-		sap_info("sapdfs: set chan freq before pre cac %d as target chan",
-			 sap_ctx->freq_before_pre_cac);
-		return sap_ctx->freq_before_pre_cac;
-	}
-#else
 	chan_freq = wlan_pre_cac_get_freq_before_pre_cac(sap_ctx->vdev);
 	if (chan_freq) {
 		sap_info("sapdfs: set chan freq before pre cac %d as target chan",
 			 chan_freq);
 		return chan_freq;
 	}
-#endif
 
 	if (sap_ctx->vendor_acs_dfs_lte_enabled && (QDF_STATUS_SUCCESS ==
 	    sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_NEXT_CHANNEL_REQ,

core/sap/src/sap_internal.h

@@ -217,15 +217,6 @@ struct sap_context {
 	eSapHddEvent sap_state;
 	eSapStatus sap_status;
 	uint32_t roc_ind_scan_id;
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-	bool is_pre_cac_on;
-	bool pre_cac_complete;
-	qdf_freq_t freq_before_pre_cac;
-#endif
 	bool vendor_acs_dfs_lte_enabled;
 	uint8_t dfs_vendor_channel;
 	uint8_t dfs_vendor_chan_bw;

core/sap/src/sap_module.c

@@ -1660,129 +1660,6 @@ QDF_STATUS wlan_sap_update_next_channel(struct sap_context *sap_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-#if defined(FEATURE_SAP_COND_CHAN_SWITCH) && defined(PRE_CAC_SUPPORT)
-QDF_STATUS wlan_sap_set_pre_cac_status(struct sap_context *sap_ctx,
-				       bool status)
-{
-	if (!sap_ctx) {
-		sap_err("Invalid SAP pointer");
-		return QDF_STATUS_E_FAULT;
-	}
-
-	sap_ctx->is_pre_cac_on = status;
-	sap_debug("is_pre_cac_on:%d", sap_ctx->is_pre_cac_on);
-
-	return QDF_STATUS_SUCCESS;
-}
-
-QDF_STATUS
-wlan_sap_set_chan_freq_before_pre_cac(struct sap_context *sap_ctx,
-				      qdf_freq_t freq_before_pre_cac)
-{
-	if (!sap_ctx) {
-		sap_err("Invalid SAP pointer");
-		return QDF_STATUS_E_FAULT;
-	}
-
-	sap_ctx->freq_before_pre_cac = freq_before_pre_cac;
-	return QDF_STATUS_SUCCESS;
-}
-#endif /* FEATURE_SAP_COND_CHAN_SWITCH */
-#endif /* PRE_CAC_COMP */
-
-#ifdef PRE_CAC_SUPPORT
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-QDF_STATUS wlan_sap_set_pre_cac_complete_status(struct sap_context *sap_ctx,
-						bool status)
-{
-	if (!sap_ctx) {
-		sap_err("Invalid SAP pointer");
-		return QDF_STATUS_E_FAULT;
-	}
-
-	sap_ctx->pre_cac_complete = status;
-	sap_debug("pre cac complete status:%d session:%d",
-		  status, sap_ctx->sessionId);
-
-	return QDF_STATUS_SUCCESS;
-}
-
-bool wlan_sap_is_pre_cac_context(struct sap_context *context)
-{
-	return context && context->is_pre_cac_on;
-}
-
-/**
- * wlan_sap_is_pre_cac_active() - Checks if pre cac in in progress
- * @handle: Global MAC handle
- *
- * Checks if pre cac is in progress in any of the SAP contexts
- *
- * Return: True is pre cac is active, false otherwise
- */
-bool wlan_sap_is_pre_cac_active(mac_handle_t handle)
-{
-	struct mac_context *mac = NULL;
-	struct sap_ctx_list *ctx_list;
-	int i;
-
-	mac = MAC_CONTEXT(handle);
-	if (!mac) {
-		sap_err("Invalid mac context");
-		return false;
-	}
-
-	ctx_list = mac->sap.sapCtxList;
-	for (i = 0; i < SAP_MAX_NUM_SESSION; i++) {
-		if (wlan_sap_is_pre_cac_context(ctx_list[i].sap_context))
-			return true;
-	}
-
-	return false;
-}
-
-/**
- * wlan_sap_get_pre_cac_vdev_id() - Get vdev id of the pre cac interface
- * @handle: Global handle
- * @vdev_id: vdev id
- *
- * Fetches the vdev id of the pre cac interface
- *
- * Return: QDF_STATUS
- */
-QDF_STATUS wlan_sap_get_pre_cac_vdev_id(mac_handle_t handle, uint8_t *vdev_id)
-{
-	struct mac_context *mac = NULL;
-	uint8_t i;
-
-	mac = MAC_CONTEXT(handle);
-	if (!mac) {
-		sap_err("Invalid mac context");
-		return QDF_STATUS_E_FAULT;
-	}
-
-	for (i = 0; i < SAP_MAX_NUM_SESSION; i++) {
-		struct sap_context *context =
-			mac->sap.sapCtxList[i].sap_context;
-		if (context && context->is_pre_cac_on) {
-			*vdev_id = i;
-			return QDF_STATUS_SUCCESS;
-		}
-	}
-	return QDF_STATUS_E_FAILURE;
-}
-#endif /* PRE_CAC_COMP */
-#endif /* PRE_CAC_SUPPORT */
-
 void wlansap_get_sec_channel(uint8_t sec_ch_offset,
 			     uint32_t op_chan_freq,
 			     uint32_t *sec_chan_freq)
@@ -2003,15 +1880,7 @@ QDF_STATUS wlansap_start_beacon_req(struct sap_context *sap_ctx)
 	if (mac->sap.SapDfsInfo.sap_radar_found_status == false) {
 		/* CAC Wait done without any Radar Detection */
 		dfs_cac_wait_status = true;
-/*
- * Code under PRE_CAC_COMP will be cleaned up
- * once pre cac component is done
- */
-#ifndef PRE_CAC_COMP
-		sap_ctx->pre_cac_complete = false;
-#else
 		wlan_pre_cac_complete_set(sap_ctx->vdev, false);
-#endif
 		status = sme_roam_start_beacon_req(MAC_HANDLE(mac),
 						   sap_ctx->bssid,
 						   dfs_cac_wait_status);