From 1f98e9fa79a96ec79cbb477830b2e05b97cae71d Mon Sep 17 00:00:00 2001 From: bings Date: Wed, 24 Jan 2018 16:13:41 +0800 Subject: [PATCH] qcacld-3.0: Process radar event after getting vdev start response Do not process radar event until receiving vdev start response, because during channel switch, radar may be detected again in the old channel. Change-Id: I1a524e38c25f91c684fd2c4962aeaf556d2445eb CRs-Fixed: 2175891 --- core/sap/src/sap_fsm.c | 1 - core/wma/src/wma_dev_if.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 74135c4ee339..517430ba9a54 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -1450,7 +1450,6 @@ void sap_dfs_set_current_channel(void *ctx) if (wlan_reg_is_dfs_ch(pdev, sap_ctx->channel)) { tgt_dfs_get_radars(pdev); - tgt_dfs_radar_enable(pdev, 0, 0); if (sap_ctx->csr_roamProfile.disableDFSChSwitch) tgt_dfs_control(pdev, DFS_SET_USENOL, &use_nol, sizeof(uint32_t), NULL, NULL, &error); diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index af3ff0e3b990..0c533c345e12 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -73,6 +73,7 @@ #include "wlan_policy_mgr_api.h" #include "wma_nan_datapath.h" #include "wlan_tgt_def_config.h" +#include #include #include "wlan_pmo_ucfg_api.h" #include "wlan_reg_services_api.h" @@ -1015,6 +1016,9 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, return -EINVAL; } + if (wma_is_vdev_in_ap_mode(wma, resp_event->vdev_id)) + tgt_dfs_radar_enable(wma->pdev, 0, 0); + if (resp_event->status == QDF_STATUS_SUCCESS) { wma->interfaces[resp_event->vdev_id].tx_streams = resp_event->cfgd_tx_streams;