diff --git a/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h b/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h index 3dbb9f60c586..48f9bbe485c6 100644 --- a/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h +++ b/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved. * * * Permission to use, copy, modify, and/or distribute this software for @@ -645,21 +645,6 @@ static inline bool utils_is_dfs_chan_for_freq(struct wlan_objmgr_pdev *pdev, } #endif -/** - * utils_is_dfs_ch() - is channel dfs. - * @pdev: pdev handler. - * - * is channel dfs. - * - * Return: True if channel dfs, else false. - */ -#ifdef CONFIG_CHAN_NUM_API -static inline bool utils_is_dfs_ch(struct wlan_objmgr_pdev *pdev, uint32_t chan) -{ - return wlan_reg_is_dfs_ch(pdev, chan); -} -#endif - /** * utils_is_dfs_cfreq2_ch() - is channel dfs cfreq2. * @pdev: pdev handler. diff --git a/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h b/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h index dca8d3b58138..0d6c6f81e5d4 100644 --- a/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h +++ b/umac/regulatory/dispatcher/inc/wlan_reg_services_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -682,15 +682,6 @@ void wlan_reg_update_nol_ch(struct wlan_objmgr_pdev *pdev, uint8_t num_ch, bool nol_ch); -/** - * wlan_reg_is_dfs_ch () - Checks the channel state for DFS - * @pdev: pdev ptr - * @chan: channel - * - * Return: true or false - */ -bool wlan_reg_is_dfs_ch(struct wlan_objmgr_pdev *pdev, uint8_t chan); - /** * wlan_reg_is_dsrc_chan () - Checks if the channel is dsrc channel or not * @pdev: pdev ptr diff --git a/umac/regulatory/dispatcher/src/wlan_reg_services_api.c b/umac/regulatory/dispatcher/src/wlan_reg_services_api.c index b21ec96fcf84..04fa78e76b17 100644 --- a/umac/regulatory/dispatcher/src/wlan_reg_services_api.c +++ b/umac/regulatory/dispatcher/src/wlan_reg_services_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved. * * * Permission to use, copy, modify, and/or distribute this software for @@ -488,12 +488,6 @@ void wlan_reg_update_nol_history_ch(struct wlan_objmgr_pdev *pdev, reg_update_nol_history_ch(pdev, ch_list, num_ch, nol_history_ch); } -bool wlan_reg_is_dfs_ch(struct wlan_objmgr_pdev *pdev, - uint8_t chan) -{ - return reg_is_dfs_ch(pdev, chan); -} - bool wlan_reg_is_passive_or_disable_ch(struct wlan_objmgr_pdev *pdev, uint8_t chan) { diff --git a/umac/wifi_pos/src/wifi_pos_main.c b/umac/wifi_pos/src/wifi_pos_main.c index e619d2de8ae6..c0e21c6422cb 100644 --- a/umac/wifi_pos/src/wifi_pos_main.c +++ b/umac/wifi_pos/src/wifi_pos_main.c @@ -412,7 +412,7 @@ static QDF_STATUS wifi_pos_process_ch_info_req(struct wlan_objmgr_psoc *psoc, ch_info[idx].band_center_freq1 = ch_info[idx].mhz; ch_info[idx].band_center_freq2 = 0; ch_info[idx].info = 0; - if (wlan_reg_is_dfs_ch(pdev, valid_channel_list[idx])) + if (wlan_reg_is_dfs_for_freq(pdev, ch_info[idx].mhz)) WIFI_POS_SET_DFS(ch_info[idx].info); wifi_update_channel_bw_info(psoc, pdev,