Bladeren bron

Revert "qcacld-3.0: Remove radar event if dfs_channel_switch is disable"

This reverts commit I977d93e47ee35026662d55a8e292c8790ddc7d31.

Change-Id: Iaadad6b737243228974ed75b126bf4a245313727
CRs-Fixed: 3002003
Deeksha Gupta 3 jaren geleden
bovenliggende
commit
bb656065c2
1 gewijzigde bestanden met toevoegingen van 1 en 12 verwijderingen
  1. 1 12
      core/sap/src/sap_api_link_cntl.c

+ 1 - 12
core/sap/src/sap_api_link_cntl.c

@@ -51,7 +51,6 @@
 #include "wlan_reg_services_api.h"
 #include <wlan_scan_ucfg_api.h>
 #include <wlan_scan_utils_api.h>
-#include <wlan_mlme_ucfg_api.h>
 
 /*----------------------------------------------------------------------------
  * Preprocessor Definitions and Constants
@@ -854,7 +853,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 	mac_handle_t mac_handle;
 	struct mac_context *mac_ctx;
 	uint8_t intf;
-	bool dfs_disable_channel_switch = false;
 
 	if (QDF_IS_STATUS_ERROR(wlansap_context_get(sap_ctx)))
 		return QDF_STATUS_E_FAILURE;
@@ -959,12 +957,6 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 		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);
-
-		ucfg_mlme_get_dfs_disable_channel_switch(mac_ctx->psoc,
-						&dfs_disable_channel_switch);
-		if (dfs_disable_channel_switch)
-			goto EXIT;
-
 		mac_ctx->sap.SapDfsInfo.target_chan_freq =
 			sap_indicate_radar(sap_ctx);
 
@@ -1168,11 +1160,8 @@ QDF_STATUS wlansap_roam_callback(void *ctx,
 
 		break;
 	case eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND:
-		ucfg_mlme_get_dfs_disable_channel_switch(mac_ctx->psoc,
-						&dfs_disable_channel_switch);
 		if (!policy_mgr_get_dfs_master_dynamic_enabled(
-				mac_ctx->psoc, sap_ctx->sessionId) ||
-		    dfs_disable_channel_switch)
+				mac_ctx->psoc, sap_ctx->sessionId))
 			break;
 		wlansap_roam_process_dfs_radar_found(mac_ctx, sap_ctx,
 						&qdf_ret_status);