Prechádzať zdrojové kódy

qcacld-3.0: Fix incorrect layering in scan component

Replace ucfg api call with wlan api calls for internal components.

Change-Id: Ie29483e9d80473ea54f8c3cdf350cfed3295d92b
CRs-Fixed: 3011182
Mohammed Ahmed 3 rokov pred
rodič
commit
03abb282d0

+ 3 - 2
core/sme/src/csr/csr_api_roam.c

@@ -81,6 +81,7 @@
 #include "wlan_roam_debug.h"
 #include "wlan_cm_roam_public_struct.h"
 #include "wlan_mlme_twt_api.h"
+#include <wlan_serialization_api.h>
 
 #define RSN_AUTH_KEY_MGMT_SAE           WLAN_RSN_SEL(WLAN_AKM_SAE)
 #define MAX_PWR_FCC_CHAN_12 8
@@ -718,7 +719,7 @@ QDF_STATUS csr_update_channel_list(struct mac_context *mac)
 		return lock_status;
 
 	if (mac->mlme_cfg->reg.enable_pending_chan_list_req) {
-		scan_status = ucfg_scan_get_pdev_status(mac->pdev);
+		scan_status = wlan_get_pdev_status(mac->pdev);
 		if (scan_status == SCAN_IS_ACTIVE ||
 		    scan_status == SCAN_IS_ACTIVE_AND_PENDING) {
 			mac->scan.pending_channel_list_req = true;
@@ -938,7 +939,7 @@ QDF_STATUS csr_stop(struct mac_context *mac)
 		ucfg_scan_unregister_event_handler(mac->pdev,
 						   csr_scan_event_handler,
 						   mac);
-	ucfg_scan_psoc_set_disable(mac->psoc, REASON_SYSTEM_DOWN);
+	wlan_scan_psoc_set_disable(mac->psoc, REASON_SYSTEM_DOWN);
 
 	/*
 	 * purge all serialization commnad if there are any pending to make

+ 1 - 1
core/sme/src/csr/csr_api_scan.c

@@ -106,7 +106,7 @@ QDF_STATUS csr_scan_close(struct mac_context *mac)
 	csr_purge_channel_power(mac, &mac->scan.channelPowerInfoList5G);
 	csr_ll_close(&mac->scan.channelPowerInfoList24);
 	csr_ll_close(&mac->scan.channelPowerInfoList5G);
-	ucfg_scan_psoc_set_disable(mac->psoc, REASON_SYSTEM_DOWN);
+	wlan_scan_psoc_set_disable(mac->psoc, REASON_SYSTEM_DOWN);
 
 	return QDF_STATUS_SUCCESS;
 }