From e05bc00ff3be739226cf2bbeaf175ceb0be0972d Mon Sep 17 00:00:00 2001 From: bings Date: Thu, 18 Jan 2018 14:11:53 +0800 Subject: [PATCH] qcacmn: Disable radar for current channel before selecting new channel In current implementation, after radar detection, a new channel is selected and then radar is disabled on the new channel. The new channel may be a DFS channel and radar will be disabled on the new channel. Radar disable should be called for the current channel and not on the new channel. Therefore, disable the radar first and then select the new channel. Change-Id: Ied57f8910b30ee2181406e26ace1e7a44ff691b4 CRs-Fixed: 2172007 --- umac/dfs/core/src/misc/dfs_process_radar_found_ind.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c b/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c index 66b5f14be3f9..102c57f69bbf 100644 --- a/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c +++ b/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c @@ -432,12 +432,6 @@ QDF_STATUS dfs_process_radar_ind(struct wlan_dfs *dfs, &wait_for_csa); if (wait_for_csa) return QDF_STATUS_SUCCESS; - - dfs_mlme_mark_dfs(dfs->dfs_pdev_obj, - dfs->dfs_curchan->dfs_ch_ieee, - dfs->dfs_curchan->dfs_ch_freq, - dfs->dfs_curchan->dfs_ch_vhtop_ch_freq_seg2, - dfs->dfs_curchan->dfs_ch_flags); /* * EV 129487 : We have detected radar in the channel, * stop processing PHY error data as this can cause @@ -450,5 +444,11 @@ QDF_STATUS dfs_process_radar_ind(struct wlan_dfs *dfs, dfs_second_segment_radar_disable(dfs); } + dfs_mlme_mark_dfs(dfs->dfs_pdev_obj, + dfs->dfs_curchan->dfs_ch_ieee, + dfs->dfs_curchan->dfs_ch_freq, + dfs->dfs_curchan->dfs_ch_vhtop_ch_freq_seg2, + dfs->dfs_curchan->dfs_ch_flags); + return QDF_STATUS_SUCCESS; }