From 245f632196b718b9227da23d439e3ce55cd6bff4 Mon Sep 17 00:00:00 2001 From: Deeksha Gupta Date: Fri, 30 Jul 2021 12:19:50 +0530 Subject: [PATCH] Revert "qcacld-3.0: Remove radar event if dfs_channel_switch is disable" This reverts commit I977d93e47ee35026662d55a8e292c8790ddc7d31. Change-Id: Iaadad6b737243228974ed75b126bf4a245313727 CRs-Fixed: 3002003 --- core/sap/src/sap_api_link_cntl.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 4c968562159e..8bf3e659ad17 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -51,7 +51,6 @@ #include "wlan_reg_services_api.h" #include #include -#include /*---------------------------------------------------------------------------- * Preprocessor Definitions and Constants @@ -845,7 +844,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; @@ -963,12 +961,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); @@ -1180,11 +1172,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);