qcacld-3.0: Use wlan_scan_* API instead of ucfg_scan_* API from umac

Use wlan_scan_* API instead of ucfg_scan_* API for scan calles from
umac.

Change-Id: Ib48ee01443ca9ff9ec66a931a95c152376c5027e
CRs-Fixed: 3192125

components/p2p/core/src/wlan_p2p_main.c

@@ -27,7 +27,7 @@
 #include <wlan_objmgr_pdev_obj.h>
 #include <wlan_objmgr_vdev_obj.h>
 #include <wlan_objmgr_peer_obj.h>
-#include <wlan_scan_ucfg_api.h>
+#include <wlan_scan_api.h>
 #include "wlan_p2p_public_struct.h"
 #include "wlan_p2p_ucfg_api.h"
 #include "wlan_p2p_tgt_api.h"
@@ -847,7 +847,7 @@ QDF_STATUS p2p_psoc_start(struct wlan_objmgr_psoc *soc,
 	tgt_p2p_register_macaddr_rx_filter_evt_handler(soc, true);
 	tgt_p2p_register_mcc_quota_ev_handler(soc, true);
 	/* register scan request id */
-	p2p_soc_obj->scan_req_id = ucfg_scan_register_requester(
+	p2p_soc_obj->scan_req_id = wlan_scan_register_requester(
 		soc, P2P_MODULE_NAME, tgt_p2p_scan_event_cb,
 		p2p_soc_obj);
 
@@ -892,7 +892,7 @@ QDF_STATUS p2p_psoc_stop(struct wlan_objmgr_psoc *soc)
 	p2p_cleanup_roc_sync(p2p_soc_obj, NULL);
 
 	/* unrgister scan request id*/
-	ucfg_scan_unregister_requester(soc, p2p_soc_obj->scan_req_id);
+	wlan_scan_unregister_requester(soc, p2p_soc_obj->scan_req_id);
 
 	tgt_p2p_register_mcc_quota_ev_handler(soc, false);
 	/* unregister p2p lo stop and noa event */

components/p2p/core/src/wlan_p2p_roc.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -22,7 +23,7 @@
 
 #include <wlan_mgmt_txrx_utils_api.h>
 #include <wlan_scan_public_structs.h>
-#include <wlan_scan_ucfg_api.h>
+#include <wlan_scan_api.h>
 #include <wlan_objmgr_psoc_obj.h>
 #include <wlan_objmgr_global_obj.h>
 #include <wlan_objmgr_pdev_obj.h>
@@ -100,7 +101,7 @@ static QDF_STATUS p2p_scan_start(struct p2p_roc_context *roc_ctx)
 		goto fail;
 	}
 
-	ucfg_scan_init_default_params(vdev, req);
+	wlan_scan_init_default_params(vdev, req);
 
 	if (!roc_ctx->duration) {
 		roc_ctx->duration = P2P_ROC_DEFAULT_DURATION;
@@ -109,7 +110,7 @@ static QDF_STATUS p2p_scan_start(struct p2p_roc_context *roc_ctx)
 	}
 
 	pdev = wlan_vdev_get_pdev(vdev);
-	roc_ctx->scan_id = ucfg_scan_get_scan_id(p2p_soc_obj->soc);
+	roc_ctx->scan_id = wlan_scan_get_scan_id(p2p_soc_obj->soc);
 	req->vdev = vdev;
 	req->scan_req.scan_id = roc_ctx->scan_id;
 	req->scan_req.scan_type = SCAN_TYPE_P2P_LISTEN;
@@ -185,7 +186,7 @@ static QDF_STATUS p2p_scan_start(struct p2p_roc_context *roc_ctx)
 	p2p_debug("FW requested roc duration is:%d",
 		  req->scan_req.dwell_time_passive);
 
-	status = ucfg_scan_start(req);
+	status = wlan_scan_start(req);
 
 	p2p_debug("start scan, scan req id:%d, scan id:%d, status:%d",
 		p2p_soc_obj->scan_req_id, roc_ctx->scan_id, status);

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

@@ -377,7 +377,7 @@ QDF_STATUS lim_start(struct mac_context *mac)
 	}
 
 	mac->lim.req_id =
-		ucfg_scan_register_requester(mac->psoc,
+		wlan_scan_register_requester(mac->psoc,
 					     "LIM",
 					     lim_process_rx_scan_handler,
 					     mac);
@@ -526,7 +526,7 @@ void lim_cleanup(struct mac_context *mac)
 
 	lim_ft_cleanup_all_ft_sessions(mac);
 
-	ucfg_scan_unregister_requester(mac->psoc, mac->lim.req_id);
+	wlan_scan_unregister_requester(mac->psoc, mac->lim.req_id);
 } /*** end lim_cleanup() ***/
 
 #ifdef WLAN_FEATURE_MEMDUMP_ENABLE

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

@@ -32,7 +32,7 @@
 #include <lim_session.h>
 #include <lim_session_utils.h>
 #include <lim_admit_control.h>
-#include <wlan_scan_ucfg_api.h>
+#include <wlan_scan_api.h>
 #include "wma.h"
 #include "wlan_crypto_global_api.h"
 
@@ -708,13 +708,13 @@ QDF_STATUS lim_send_preauth_scan_offload(struct mac_context *mac_ctx,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	ucfg_scan_init_default_params(vdev, req);
+	wlan_scan_init_default_params(vdev, req);
 
 	qdf_mem_copy(req->scan_req.bssid_list,
 		     (uint8_t *)ft_preauth_req->currbssId,
 		     QDF_MAC_ADDR_SIZE);
 
-	req->scan_req.scan_id = ucfg_scan_get_scan_id(mac_ctx->psoc);
+	req->scan_req.scan_id = wlan_scan_get_scan_id(mac_ctx->psoc);
 	if (!req->scan_req.scan_id) {
 		wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_MAC_ID);
 		qdf_mem_free(req);
@@ -734,8 +734,8 @@ QDF_STATUS lim_send_preauth_scan_offload(struct mac_context *mac_ctx,
 	req->scan_req.dwell_time_active = LIM_FT_PREAUTH_SCAN_TIME;
 	req->scan_req.dwell_time_passive = LIM_FT_PREAUTH_SCAN_TIME;
 
-	status = ucfg_scan_start(req);
-	if (status != QDF_STATUS_SUCCESS)
+	status = wlan_scan_start(req);
+	if (QDF_IS_STATUS_ERROR(status))
 		/* Don't free req here, ucfg_scan_start will do free */
 		pe_info("Issue scan req failed");
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_MAC_ID);

core/sap/src/sap_api_link_cntl.c

@@ -50,7 +50,7 @@
 #include <wlan_objmgr_vdev_obj.h>
 #include <wlan_objmgr_pdev_obj.h>
 #include "wlan_reg_services_api.h"
-#include <wlan_scan_ucfg_api.h>
+#include <wlan_scan_api.h>
 #include <wlan_scan_utils_api.h>
 
 /* IF MGR API header file */
@@ -248,7 +248,7 @@ wlansap_calculate_chan_from_scan_result(mac_handle_t mac_handle,
 		filter->age_threshold = qdf_get_time_of_the_day_ms() -
 						sap_ctx->acs_req_timestamp;
 
-	list = ucfg_scan_get_result(mac_ctx->pdev, filter);
+	list = wlan_scan_get_result(mac_ctx->pdev, filter);
 
 	if (filter)
 		qdf_mem_free(filter);
@@ -259,7 +259,7 @@ wlansap_calculate_chan_from_scan_result(mac_handle_t mac_handle,
 	wlansap_send_acs_success_event(sap_ctx, scan_id);
 
 	oper_channel = sap_select_channel(mac_handle, sap_ctx, list);
-	ucfg_scan_purge_results(list);
+	wlan_scan_purge_results(list);
 
 	return oper_channel;
 }

core/sap/src/sap_fsm.c

@@ -53,7 +53,7 @@
 #include <linux/netdevice.h>
 #include <net/cfg80211.h>
 #include <qca_vendor.h>
-#include <wlan_scan_ucfg_api.h>
+#include <wlan_scan_api.h>
 #include "wlan_reg_services_api.h"
 #include "wlan_mlme_ucfg_api.h"
 #include "wlan_policy_mgr_ucfg.h"
@@ -1261,8 +1261,8 @@ QDF_STATUS sap_channel_sel(struct sap_context *sap_context)
 		}
 
 		/* Initiate a SCAN request */
-		ucfg_scan_init_default_params(vdev, req);
-		scan_id = ucfg_scan_get_scan_id(mac_ctx->psoc);
+		wlan_scan_init_default_params(vdev, req);
+		scan_id = wlan_scan_get_scan_id(mac_ctx->psoc);
 		req->scan_req.scan_id = scan_id;
 		req->scan_req.vdev_id = vdev_id;
 		req->scan_req.scan_f_passive = false;
@@ -1281,7 +1281,7 @@ QDF_STATUS sap_channel_sel(struct sap_context *sap_context)
 		/* Set requestType to Full scan */
 
 		sap_context->acs_req_timestamp = qdf_get_time_of_the_day_ms();
-		qdf_ret_status = ucfg_scan_start(req);
+		qdf_ret_status = wlan_scan_start(req);
 		if (qdf_ret_status != QDF_STATUS_SUCCESS) {
 			sap_err("scan request  fail %d!!!", qdf_ret_status);
 			sap_info("SAP Configuring default ch, Ch_freq=%d",

core/sap/src/sap_module.c

@@ -47,7 +47,7 @@
 #include "cds_ieee80211_common_i.h"
 #include "cds_regdomain.h"
 #include "wlan_policy_mgr_api.h"
-#include <wlan_scan_ucfg_api.h>
+#include <wlan_scan_api.h>
 #include "wlan_reg_services_api.h"
 #include <wlan_dfs_utils_api.h>
 #include <wlan_reg_ucfg_api.h>
@@ -324,7 +324,7 @@ QDF_STATUS sap_init_ctx(struct sap_context *sap_ctx,
 	/* Register with scan component only during init */
 	if (!reinit)
 		sap_ctx->req_id =
-			ucfg_scan_register_requester(mac->psoc, "SAP",
+			wlan_scan_register_requester(mac->psoc, "SAP",
 					sap_scan_event_callback, sap_ctx);
 
 	if (!reinit) {
@@ -358,7 +358,7 @@ QDF_STATUS sap_deinit_ctx(struct sap_context *sap_ctx)
 		sap_err("Invalid MAC context");
 		return QDF_STATUS_E_FAULT;
 	}
-	ucfg_scan_unregister_requester(mac->psoc, sap_ctx->req_id);
+	wlan_scan_unregister_requester(mac->psoc, sap_ctx->req_id);
 
 	if (sap_ctx->freq_list) {
 		qdf_mem_free(sap_ctx->freq_list);

core/sme/src/csr/csr_api_scan.c

@@ -42,7 +42,7 @@
 #include "wlan_hdd_main.h"
 #include "pld_common.h"
 #include "csr_internal.h"
-#include <wlan_scan_ucfg_api.h>
+#include <wlan_scan_api.h>
 #include <wlan_scan_api.h>
 #include <wlan_scan_utils_api.h>
 #include <wlan_objmgr_vdev_obj.h>
@@ -887,7 +887,7 @@ QDF_STATUS csr_scan_get_result(struct mac_context *mac_ctx,
 		return QDF_STATUS_E_INVAL;
 	}
 
-	list = ucfg_scan_get_result(pdev, filter);
+	list = wlan_scan_get_result(pdev, filter);
 	if (list) {
 		num_bss = qdf_list_size(list);
 		sme_debug("num_entries %d", num_bss);
@@ -935,7 +935,7 @@ QDF_STATUS csr_scan_get_result(struct mac_context *mac_ctx,
 
 error:
 	if (list)
-		ucfg_scan_purge_results(list);
+		wlan_scan_purge_results(list);
 	if (pdev)
 		wlan_objmgr_pdev_release_ref(pdev, WLAN_LEGACY_MAC_ID);
 

core/sme/src/rrm/sme_rrm.c

@@ -35,7 +35,7 @@
 #include "csr_inside_api.h"
 
 #include "rrm_global.h"
-#include <wlan_scan_ucfg_api.h>
+#include <wlan_scan_api.h>
 #include <wlan_scan_utils_api.h>
 #include <wlan_reg_services_api.h>
 #include <wlan_utility.h>
@@ -821,8 +821,8 @@ QDF_STATUS sme_rrm_issue_scan_req(struct mac_context *mac_ctx, uint8_t idx)
 			qdf_mem_free(req);
 			goto send_ind;
 		}
-		ucfg_scan_init_default_params(vdev, req);
-		req->scan_req.scan_id = ucfg_scan_get_scan_id(mac_ctx->psoc);
+		wlan_scan_init_default_params(vdev, req);
+		req->scan_req.scan_id = wlan_scan_get_scan_id(mac_ctx->psoc);
 		sme_rrm_ctx->scan_id = req->scan_req.scan_id;
 
 		sme_debug("RRM_SCN: rrm_idx:%d scan_id:%d",
@@ -945,7 +945,7 @@ QDF_STATUS sme_rrm_issue_scan_req(struct mac_context *mac_ctx, uint8_t idx)
 		 */
 		req->scan_req.scan_type = SCAN_TYPE_RRM;
 
-		status = ucfg_scan_start(req);
+		status = wlan_scan_start(req);
 		wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID);
 		if (QDF_IS_STATUS_ERROR(status))
 			goto send_ind;
@@ -1807,7 +1807,7 @@ QDF_STATUS rrm_start(struct mac_context *mac_ctx)
 
 
 	/* Register with scan component */
-	req_id = ucfg_scan_register_requester(mac_ctx->psoc,
+	req_id = wlan_scan_register_requester(mac_ctx->psoc,
 					      "RRM",
 					      sme_rrm_scan_event_callback,
 					      mac_ctx);
@@ -1832,8 +1832,7 @@ QDF_STATUS rrm_stop(struct mac_context *mac_ctx)
 		smerrmctx->req_id = 0;
 	}
 
-	ucfg_scan_unregister_requester(mac_ctx->psoc,
-				       req_id);
+	wlan_scan_unregister_requester(mac_ctx->psoc, req_id);
 
 	return QDF_STATUS_SUCCESS;
 }