From 5fc318cedb6c2d4d70a583b75fc8d7994da2c78e Mon Sep 17 00:00:00 2001 From: bings Date: Wed, 27 Dec 2017 15:51:26 +0800 Subject: [PATCH] qcacmn: Do not switch channel in DFS testing mode If gDisableDFSChSwitch is configured as 1, channel should not be changed even radar is found. Set usenol as 0 when gDisableDFSChSwitch is configured as 1. Change-Id: I05c4afea3eb9af9c541b2324a2d50ea59c05f7d7 CRs-Fixed: 2168792 --- umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c b/umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c index f2139ea422..2986ad92fe 100644 --- a/umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c +++ b/umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. * * * Permission to use, copy, modify, and/or distribute this software for @@ -97,6 +97,7 @@ void dfs_mlme_mark_dfs(struct wlan_objmgr_pdev *pdev, } #endif +#ifndef QCA_MCL_DFS_SUPPORT void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev, uint8_t ieee_chan, uint16_t freq, uint8_t cfreq2, uint64_t flags) @@ -105,6 +106,22 @@ void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev, global_dfs_to_mlme.mlme_start_csa(pdev, ieee_chan, freq, cfreq2, flags); } +#else +void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev, + uint8_t ieee_chan, uint16_t freq, + uint8_t cfreq2, uint64_t flags) +{ + if (!pdev) { + dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS, "null pdev"); + return; + } + + wlan_objmgr_pdev_iterate_obj_list(pdev, + WLAN_VDEV_OP, + dfs_send_radar_ind, + NULL, 0, WLAN_DFS_ID); +} +#endif #ifndef QCA_MCL_DFS_SUPPORT void dfs_mlme_proc_cac(struct wlan_objmgr_pdev *pdev, uint32_t vdev_id)