From 8202412c0d951935fc557de4fd42e672a3adcfc5 Mon Sep 17 00:00:00 2001 From: Priyadarshnee S Date: Mon, 18 Mar 2019 13:03:57 +0530 Subject: [PATCH] qcacmn: Rename "dfs_freq_is_in_nol" to "dfs_is_freq_in_nol" Rename "dfs_freq_is_in_nol" to "dfs_is_freq_in_nol" CRs-Fixed: 2417878 Change-Id: Iedd79e9ea51a84d0458e643ddafa2797ed5f337c --- umac/dfs/core/src/dfs.h | 4 ++-- umac/dfs/core/src/misc/dfs_random_chan_sel.c | 4 ++-- umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h | 4 ++-- umac/dfs/dispatcher/src/wlan_dfs_utils_api.c | 4 ++-- umac/scan/core/src/wlan_scan_manager.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/umac/dfs/core/src/dfs.h b/umac/dfs/core/src/dfs.h index b5c4a895448b..fd381fb74b1d 100644 --- a/umac/dfs/core/src/dfs.h +++ b/umac/dfs/core/src/dfs.h @@ -2605,7 +2605,7 @@ bool dfs_check_for_cac_start(struct wlan_dfs *dfs, void dfs_task_testtimer_reset(struct wlan_dfs *dfs); /** - * dfs_freq_is_in_nol() - check if given channel in nol list + * dfs_is_freq_in_nol() - check if given channel in nol list * @dfs: Pointer to wlan_dfs structure * @freq: channel frequency * @@ -2613,7 +2613,7 @@ void dfs_task_testtimer_reset(struct wlan_dfs *dfs); * * Return: true if channel in nol, false else */ -bool dfs_freq_is_in_nol(struct wlan_dfs *dfs, uint32_t freq); +bool dfs_is_freq_in_nol(struct wlan_dfs *dfs, uint32_t freq); /** * dfs_task_testtimer_detach() - Free dfs test timer. diff --git a/umac/dfs/core/src/misc/dfs_random_chan_sel.c b/umac/dfs/core/src/misc/dfs_random_chan_sel.c index fce8adb0abdb..b05f19964bbf 100644 --- a/umac/dfs/core/src/misc/dfs_random_chan_sel.c +++ b/umac/dfs/core/src/misc/dfs_random_chan_sel.c @@ -1206,7 +1206,7 @@ static void dfs_remove_cur_ch_from_list( return; } -bool dfs_freq_is_in_nol(struct wlan_dfs *dfs, uint32_t freq) +bool dfs_is_freq_in_nol(struct wlan_dfs *dfs, uint32_t freq) { struct dfs_nolelem *nol; @@ -1360,7 +1360,7 @@ static void dfs_apply_rules(struct wlan_dfs *dfs, continue; } - if (dfs_freq_is_in_nol(dfs, chan->dfs_ch_freq)) { + if (dfs_is_freq_in_nol(dfs, chan->dfs_ch_freq)) { dfs_debug(dfs, WLAN_DEBUG_DFS_RANDOM_CHAN, "skip nol channel=%d", chan->dfs_ch_ieee); continue; diff --git a/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h b/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h index e5301d35ddef..ec5c29189f8f 100644 --- a/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h +++ b/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h @@ -105,7 +105,7 @@ QDF_STATUS utils_dfs_cac_valid_reset(struct wlan_objmgr_pdev *pdev, QDF_STATUS utils_dfs_reset(struct wlan_objmgr_pdev *pdev); /** - * utils_dfs_freq_is_in_nol() - check if given channel in nol list + * utils_dfs_is_freq_in_nol() - check if given channel in nol list * @pdev: Pointer to DFS pdev object * @freq: channel frequency * @@ -113,7 +113,7 @@ QDF_STATUS utils_dfs_reset(struct wlan_objmgr_pdev *pdev); * * Return: true if channel in nol, false else */ -bool utils_dfs_freq_is_in_nol(struct wlan_objmgr_pdev *pdev, uint32_t freq); +bool utils_dfs_is_freq_in_nol(struct wlan_objmgr_pdev *pdev, uint32_t freq); /** * utils_dfs_reset_precaclists() - Clears and initiakizes precac_required_list, diff --git a/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c b/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c index 7a759bcb1443..39ace56c6efe 100644 --- a/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c +++ b/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c @@ -59,7 +59,7 @@ QDF_STATUS utils_dfs_reset(struct wlan_objmgr_pdev *pdev) return QDF_STATUS_SUCCESS; } -bool utils_dfs_freq_is_in_nol(struct wlan_objmgr_pdev *pdev, uint32_t freq) +bool utils_dfs_is_freq_in_nol(struct wlan_objmgr_pdev *pdev, uint32_t freq) { struct wlan_dfs *dfs; @@ -67,7 +67,7 @@ bool utils_dfs_freq_is_in_nol(struct wlan_objmgr_pdev *pdev, uint32_t freq) if (!dfs) return false; - return dfs_freq_is_in_nol(dfs, freq); + return dfs_is_freq_in_nol(dfs, freq); } QDF_STATUS utils_dfs_cac_valid_reset(struct wlan_objmgr_pdev *pdev, diff --git a/umac/scan/core/src/wlan_scan_manager.c b/umac/scan/core/src/wlan_scan_manager.c index 51d3f58bb35a..02f83b4e04a0 100644 --- a/umac/scan/core/src/wlan_scan_manager.c +++ b/umac/scan/core/src/wlan_scan_manager.c @@ -812,7 +812,7 @@ scm_update_channel_list(struct scan_start_request *req, if (skip_dfs_ch && wlan_reg_is_dfs_ch(pdev, wlan_reg_freq_to_chan(pdev, freq))) continue; - if (utils_dfs_freq_is_in_nol(pdev, freq)) + if (utils_dfs_is_freq_in_nol(pdev, freq)) continue; req->scan_req.chan_list.chan[num_scan_channels++] = req->scan_req.chan_list.chan[i];