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

qcacmn: Remove dfs_mlme_mark_dfs_for_freq function

Browse Source 
The function dfs_mlme_mark_dfs_for_freq was introduced as a counterpart of
dfs_mlme_mark_dfs but both implement same functionality. In order to remove
redundancy, remove dfs_mlme_mark_dfs_for_freq. Replace the references to
dfs_mlme_mark_dfs_for_freq with dfs_mlme_mark_dfs.

CRs-Fixed: 2738831
Change-Id: I567861e4491802d73549670dfd30113b1a773d07
This commit is contained in:
Vijay Krishnan
2020-08-20 19:13:14 +05:30
committed by snandini
parent df0c00317b
commit 30d4093334
6 changed files with 17 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
umac/dfs/dispatcher/inc/wlan_dfs_mlme_api.h
View File

@@ -46,29 +46,12 @@ void dfs_mlme_start_rcsa(struct wlan_objmgr_pdev *pdev,
* @vhtop_ch_freq_seg2: VHT80 Cfreq2.
* @flags: channel flags.
*/
#ifdef CONFIG_CHAN_NUM_API
void dfs_mlme_mark_dfs(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint16_t freq,
uint8_t vhtop_ch_freq_seg2,
uint16_t vhtop_ch_freq_seg2,
uint64_t flags);
#endif
/**
* dfs_mlme_mark_dfs_for_freq() - Mark the channel in the channel list.
* @pdev: Pointer to DFS pdev object.
* @ieee: Channel number.
* @freq: Channel frequency.
* @vhtop_ch_freq_seg2_mhz: VHT80 Cfreq2 in Mhz.
* @flags: channel flags.
*/
#ifdef CONFIG_CHAN_FREQ_API
void dfs_mlme_mark_dfs_for_freq(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint16_t freq,
uint16_t vhtop_ch_freq_mhz_seg2,
uint64_t flags);
#endif
/**
* dfs_mlme_start_csa() - Sends CSA in ieeeChan
* @pdev: Pointer to DFS pdev object.

14
umac/dfs/dispatcher/inc/wlan_dfs_ucfg_api.h
View File

@@ -36,7 +36,6 @@
* @pdev_component_obj_detach: Detach DFS object from PDEV.
* @pdev_get_comp_private_obj: Get DFS object from PDEV.
* @dfs_start_rcsa: Send RCSA to RootAP.
* @mlme_mark_dfs: Calls dfs_action function.
* @mlme_start_csa: Sends CSA.
* @mlme_proc_cac: Process the CAC completion event.
* @mlme_deliver_event_up_after_cac: Send a CAC timeout, VAP up event to user
@@ -69,7 +68,7 @@
* Channel Switch Announcement.
* @mlme_postnol_chan_switch: Channel change post NOL using Channel
* Switch Announcement.
* @mlme_mark_dfs_for_freq: Mark DFS channel frequency as radar.
* @mlme_mark_dfs: Mark DFS channel frequency as radar.
* @mlme_get_extchan_for_freq: Get the extension channel.
* @mlme_find_dot11_chan_for_freq: Find a channel pointer.
* @mlme_get_dfs_channels_for_freq: Get DFS channels from current channel
@@ -91,20 +90,11 @@ struct dfs_to_mlme {
void *comp_priv_obj);
QDF_STATUS (*dfs_start_rcsa)(struct wlan_objmgr_pdev *pdev,
bool *wait_for_csa);
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS (*mlme_mark_dfs)(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint16_t freq,
uint8_t vhtop_ch_freq_seg2,
uint16_t vhtop_ch_freq_seg2,
uint64_t flags);
#endif
#ifdef CONFIG_CHAN_FREQ_API
QDF_STATUS (*mlme_mark_dfs_for_freq)(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint16_t freq,
uint16_t ic_mhz_freq_seg2,
uint64_t flags);
#endif
#ifdef CONFIG_CHAN_NUM_API
QDF_STATUS (*mlme_start_csa)(struct wlan_objmgr_pdev *pdev,
uint8_t ieee_chan, uint16_t freq,

3
umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c
View File

@@ -109,7 +109,6 @@ register_dfs_callbacks_for_freq(struct dfs_to_mlme *mlme_callback)
if (!mlme_callback)
return;
mlme_callback->mlme_mark_dfs_for_freq = mlme_dfs_mark_dfs_for_freq;
mlme_callback->mlme_find_dot11_chan_for_freq =
mlme_dfs_find_dot11_chan_for_freq;
mlme_callback->mlme_get_dfs_channels_for_freq =
@@ -168,6 +167,8 @@ void register_dfs_callbacks(void)
mlme_acquire_radar_mode_switch_lock;
tmp_dfs_to_mlme->mlme_release_radar_mode_switch_lock =
mlme_release_radar_mode_switch_lock;
tmp_dfs_to_mlme->mlme_mark_dfs =
mlme_dfs_mark_dfs;
/*
* Register precac auto channel switch feature related callbacks
*/

46
umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c
View File

@@ -41,11 +41,10 @@ void dfs_mlme_start_rcsa(struct wlan_objmgr_pdev *pdev,
#endif
#ifndef QCA_MCL_DFS_SUPPORT
#ifdef CONFIG_CHAN_NUM_API
void dfs_mlme_mark_dfs(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint16_t freq,
uint8_t vhtop_ch_freq_seg2,
uint16_t vhtop_ch_freq_seg2,
uint64_t flags)
{
if (global_dfs_to_mlme.mlme_mark_dfs)
@@ -55,22 +54,6 @@ void dfs_mlme_mark_dfs(struct wlan_objmgr_pdev *pdev,
vhtop_ch_freq_seg2,
flags);
}
#endif
#ifdef CONFIG_CHAN_FREQ_API
void dfs_mlme_mark_dfs_for_freq(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint16_t freq,
uint16_t vhtop_ch_freq_seg2,
uint64_t flags)
{
if (global_dfs_to_mlme.mlme_mark_dfs_for_freq)
global_dfs_to_mlme.mlme_mark_dfs_for_freq(pdev,
ieee,
freq,
vhtop_ch_freq_seg2,
flags);
}
#endif
#else /* Else of ndef MCL_DFS_SUPPORT */
static void dfs_send_radar_ind(struct wlan_objmgr_pdev *pdev,
void *object,
@@ -89,11 +72,10 @@ static void dfs_send_radar_ind(struct wlan_objmgr_pdev *pdev,
vdev_id);
}
#ifdef CONFIG_CHAN_NUM_API
void dfs_mlme_mark_dfs(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint16_t freq,
uint8_t vhtop_ch_freq_seg2,
uint16_t vhtop_ch_freq_seg2,
uint64_t flags)
{
struct wlan_objmgr_vdev *vdev;
@@ -112,30 +94,6 @@ void dfs_mlme_mark_dfs(struct wlan_objmgr_pdev *pdev,
}
#endif
#ifdef CONFIG_CHAN_FREQ_API
void dfs_mlme_mark_dfs_for_freq(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint16_t freq,
uint16_t vhtop_ch_freq_seg2,
uint64_t flags)
{
struct wlan_objmgr_vdev *vdev;
if (!pdev) {
dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS, "null pdev");
return;
}
vdev = wlan_pdev_peek_active_first_vdev(pdev, WLAN_DFS_ID);
if (vdev) {
dfs_send_radar_ind(pdev, vdev, NULL);
wlan_objmgr_vdev_release_ref(vdev, WLAN_DFS_ID);
}
}
#endif
#endif
#ifndef QCA_MCL_DFS_SUPPORT
#ifdef CONFIG_CHAN_NUM_API
void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev,