samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Cleanup for function wlan_reg_is_dfs_ch()

Browse Source 
Replace wlan_reg_is_dfs_ch() with wlan_reg_is_dfs_for_freq()

Change-Id: Idb40beeea3ba07e133f3346b46998ae9ac549ba7
CRs-Fixed: 2615754
This commit is contained in:
Amruta Kulkarni
2020-01-23 18:08:51 -08:00
committed by nshrivas
parent dbf2ff57bc
commit 65f217ba99
4 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h
View File

@@ -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 * 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 #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. * utils_is_dfs_cfreq2_ch() - is channel dfs cfreq2.
* @pdev: pdev handler. * @pdev: pdev handler.

11
umac/regulatory/dispatcher/inc/wlan_reg_services_api.h
View File

@@ -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 * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * 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, uint8_t num_ch,
bool nol_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 * wlan_reg_is_dsrc_chan () - Checks if the channel is dsrc channel or not
* @pdev: pdev ptr * @pdev: pdev ptr

8
umac/regulatory/dispatcher/src/wlan_reg_services_api.c
View File

@@ -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 * 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); 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, bool wlan_reg_is_passive_or_disable_ch(struct wlan_objmgr_pdev *pdev,
uint8_t chan) uint8_t chan)
{ {

2
umac/wifi_pos/src/wifi_pos_main.c
View File

@@ -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_freq1 = ch_info[idx].mhz;
ch_info[idx].band_center_freq2 = 0; ch_info[idx].band_center_freq2 = 0;
ch_info[idx].info = 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_POS_SET_DFS(ch_info[idx].info);
wifi_update_channel_bw_info(psoc, pdev, wifi_update_channel_bw_info(psoc, pdev,