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
This commit is contained in:

committed by
Madan Koyyalamudi

orang tua
713719d24a
melakukan
810795a323
@@ -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;
|
||||
}
|
||||
|
@@ -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",
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user