qcacmn: Rename a DFS CAC function and corresponding function pointer
Rename the function dfs_mlme_deliver_event_up_afrer_cac() to dfs_mlme_deliver_event_up_after_cac and rename the function pointer mlme_deliver_event_up_afrer_ca to mlme_deliver_event_up_after_cac Change-Id: I29c2094a0b45c9583b897e088ce9938c759e26ba CRs-Fixed: 2251792
This commit is contained in:

committed by
nshrivas

parent
4d5a2fe8d9
commit
e556063bc7
@@ -148,7 +148,7 @@ static os_timer_func(dfs_cac_timeout)
|
|||||||
dfs_mlme_proc_cac(dfs->dfs_pdev_obj, 0);
|
dfs_mlme_proc_cac(dfs->dfs_pdev_obj, 0);
|
||||||
|
|
||||||
/* Send a CAC timeout, VAP up event to user space */
|
/* Send a CAC timeout, VAP up event to user space */
|
||||||
dfs_mlme_deliver_event_up_afrer_cac(dfs->dfs_pdev_obj);
|
dfs_mlme_deliver_event_up_after_cac(dfs->dfs_pdev_obj);
|
||||||
|
|
||||||
if (dfs->dfs_defer_precac_channel_change == 1) {
|
if (dfs->dfs_defer_precac_channel_change == 1) {
|
||||||
dfs_mlme_channel_change_by_precac(dfs->dfs_pdev_obj);
|
dfs_mlme_channel_change_by_precac(dfs->dfs_pdev_obj);
|
||||||
|
@@ -72,11 +72,11 @@ void dfs_mlme_start_csa(struct wlan_objmgr_pdev *pdev,
|
|||||||
void dfs_mlme_proc_cac(struct wlan_objmgr_pdev *pdev, uint32_t vdev_id);
|
void dfs_mlme_proc_cac(struct wlan_objmgr_pdev *pdev, uint32_t vdev_id);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* dfs_mlme_deliver_event_up_afrer_cac() - Send a CAC timeout, VAP up event to
|
* dfs_mlme_deliver_event_up_after_cac() - Send a CAC timeout, VAP up event to
|
||||||
* userspace.
|
* userspace.
|
||||||
* @pdev: Pointer to DFS pdev object.
|
* @pdev: Pointer to DFS pdev object.
|
||||||
*/
|
*/
|
||||||
void dfs_mlme_deliver_event_up_afrer_cac(struct wlan_objmgr_pdev *pdev);
|
void dfs_mlme_deliver_event_up_after_cac(struct wlan_objmgr_pdev *pdev);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* dfs_mlme_get_dfs_ch_nchans() - Get number of channels in the channel list
|
* dfs_mlme_get_dfs_ch_nchans() - Get number of channels in the channel list
|
||||||
|
@@ -37,7 +37,7 @@
|
|||||||
* @mlme_mark_dfs: Calls dfs_action function.
|
* @mlme_mark_dfs: Calls dfs_action function.
|
||||||
* @mlme_start_csa: Sends CSA.
|
* @mlme_start_csa: Sends CSA.
|
||||||
* @mlme_proc_cac: Process the CAC completion event.
|
* @mlme_proc_cac: Process the CAC completion event.
|
||||||
* @mlme_deliver_event_up_afrer_cac: Send a CAC timeout, VAP up event to user
|
* @mlme_deliver_event_up_after_cac: Send a CAC timeout, VAP up event to user
|
||||||
* space
|
* space
|
||||||
* @mlme_get_dfs_ch_nchans: Get number of channels in the channel
|
* @mlme_get_dfs_ch_nchans: Get number of channels in the channel
|
||||||
* list.
|
* list.
|
||||||
@@ -76,7 +76,7 @@ struct dfs_to_mlme {
|
|||||||
uint8_t ieee_chan, uint16_t freq,
|
uint8_t ieee_chan, uint16_t freq,
|
||||||
uint8_t cfreq2, uint64_t flags);
|
uint8_t cfreq2, uint64_t flags);
|
||||||
QDF_STATUS (*mlme_proc_cac)(struct wlan_objmgr_pdev *pdev);
|
QDF_STATUS (*mlme_proc_cac)(struct wlan_objmgr_pdev *pdev);
|
||||||
QDF_STATUS (*mlme_deliver_event_up_afrer_cac)(
|
QDF_STATUS (*mlme_deliver_event_up_after_cac)(
|
||||||
struct wlan_objmgr_pdev *pdev);
|
struct wlan_objmgr_pdev *pdev);
|
||||||
QDF_STATUS (*mlme_get_dfs_ch_nchans)(struct wlan_objmgr_pdev *pdev,
|
QDF_STATUS (*mlme_get_dfs_ch_nchans)(struct wlan_objmgr_pdev *pdev,
|
||||||
int *nchans);
|
int *nchans);
|
||||||
|
@@ -62,8 +62,8 @@ void register_dfs_callbacks(void)
|
|||||||
tmp_dfs_to_mlme->mlme_mark_dfs = mlme_dfs_mark_dfs;
|
tmp_dfs_to_mlme->mlme_mark_dfs = mlme_dfs_mark_dfs;
|
||||||
tmp_dfs_to_mlme->mlme_start_csa = mlme_dfs_start_csa;
|
tmp_dfs_to_mlme->mlme_start_csa = mlme_dfs_start_csa;
|
||||||
tmp_dfs_to_mlme->mlme_proc_cac = mlme_dfs_proc_cac;
|
tmp_dfs_to_mlme->mlme_proc_cac = mlme_dfs_proc_cac;
|
||||||
tmp_dfs_to_mlme->mlme_deliver_event_up_afrer_cac =
|
tmp_dfs_to_mlme->mlme_deliver_event_up_after_cac =
|
||||||
mlme_dfs_deliver_event_up_afrer_cac;
|
mlme_dfs_deliver_event_up_after_cac;
|
||||||
tmp_dfs_to_mlme->mlme_get_dfs_ch_nchans = mlme_dfs_get_dfs_ch_nchans;
|
tmp_dfs_to_mlme->mlme_get_dfs_ch_nchans = mlme_dfs_get_dfs_ch_nchans;
|
||||||
tmp_dfs_to_mlme->mlme_get_extchan = mlme_dfs_get_extchan;
|
tmp_dfs_to_mlme->mlme_get_extchan = mlme_dfs_get_extchan;
|
||||||
tmp_dfs_to_mlme->mlme_set_no_chans_available =
|
tmp_dfs_to_mlme->mlme_set_no_chans_available =
|
||||||
|
@@ -131,10 +131,10 @@ void dfs_mlme_proc_cac(struct wlan_objmgr_pdev *pdev, uint32_t vdev_id)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void dfs_mlme_deliver_event_up_afrer_cac(struct wlan_objmgr_pdev *pdev)
|
void dfs_mlme_deliver_event_up_after_cac(struct wlan_objmgr_pdev *pdev)
|
||||||
{
|
{
|
||||||
if (global_dfs_to_mlme.mlme_deliver_event_up_afrer_cac != NULL)
|
if (global_dfs_to_mlme.mlme_deliver_event_up_after_cac)
|
||||||
global_dfs_to_mlme.mlme_deliver_event_up_afrer_cac(
|
global_dfs_to_mlme.mlme_deliver_event_up_after_cac(
|
||||||
pdev);
|
pdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user