samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
フォーク 0
コード イシュー プルリクエスト Actions パッケージ プロジェクト リリース Wiki アクティビティ

qcacmn: Avoid using "ic_" prefix in common component code

ソースを参照 
In DFS component the prefix "ic_ " was being used to represent ieee80211
channel related variables. Now  use prefix "dfs_ch_" instead of "ic_".

Change-Id: I2f739dc22ad89b7e410c06462876a22c2a615883
CRs-Fixed: 2056957
このコミットが含まれているのは:
Abhijit Pradhan
2017-05-29 20:43:03 +05:30
committed by snandini
親 f3351d97d7
コミット 7dc39001a5
22個のファイルの変更、510行の追加、481行の削除
Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

104
umac/dfs/dispatcher/inc/wlan_dfs_mlme_api.h
ファイルの表示

@@ -76,25 +76,25 @@ 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
* userspace.
* userspace.
* @pdev: Pointer to DFS pdev object.
*/
void dfs_mlme_deliver_event_up_afrer_cac(struct wlan_objmgr_pdev *pdev);
/**
* dfs_mlme_get_ic_nchans() - Get number of channels in the channel list
* dfs_mlme_get_dfs_ch_nchans() - Get number of channels in the channel list
* @pdev: Pointer to DFS pdev object.
* @nchans: Pointer to save the channel number.
*/
void dfs_mlme_get_ic_nchans(struct wlan_objmgr_pdev *pdev, int *nchans);
void dfs_mlme_get_dfs_ch_nchans(struct wlan_objmgr_pdev *pdev, int *nchans);
/**
* dfs_mlme_get_ic_no_weather_radar_chan() - Checks is the channel is weather
* radar channel.
* dfs_mlme_get_dfs_ch_no_weather_radar_chan() - Checks is the channel is
* weather radar channel.
* @pdev: Pointer to DFS pdev object.
* @no_wradar: Pointer to save weather radar filter value.
*/
void dfs_mlme_get_ic_no_weather_radar_chan(struct wlan_objmgr_pdev *pdev,
void dfs_mlme_get_dfs_ch_no_weather_radar_chan(struct wlan_objmgr_pdev *pdev,
uint8_t *no_wradar);
/**
@@ -120,21 +120,21 @@ void dfs_mlme_find_any_valid_channel(struct wlan_objmgr_pdev *pdev,
/**
* dfs_mlme_get_extchan() - Get extension channel.
* @pdev: Pointer to DFS pdev object.
* @ic_freq: Frequency in Mhz.
* @ic_flags: Channel flags.
* @ic_flagext: Extended channel flags.
* @ic_ieee: IEEE channel number.
* @ic_vhtop_ch_freq_seg1: Channel Center frequency.
* @ic_vhtop_ch_freq_seg2: Channel Center frequency applicable for 80+80MHz
* @dfs_ch_freq: Frequency in Mhz.
* @dfs_ch_flags: Channel flags.
* @dfs_ch_flagext: Extended channel flags.
* @dfs_ch_ieee: IEEE channel number.
* @dfs_ch_vhtop_ch_freq_seg1: Channel Center frequency.
* @dfs_ch_vhtop_ch_freq_seg2: Channel Center frequency applicable for 80+80MHz
* mode of operation.
*/
QDF_STATUS dfs_mlme_get_extchan(struct wlan_objmgr_pdev *pdev,
uint16_t *ic_freq,
uint32_t *ic_flags,
uint16_t *ic_flagext,
uint8_t *ic_ieee,
uint8_t *ic_vhtop_ch_freq_seg1,
uint8_t *ic_vhtop_ch_freq_seg2);
uint16_t *dfs_ch_freq,
uint32_t *dfs_ch_flags,
uint16_t *dfs_ch_flagext,
uint8_t *dfs_ch_ieee,
uint8_t *dfs_ch_vhtop_ch_freq_seg1,
uint8_t *dfs_ch_vhtop_ch_freq_seg2);
/**
* dfs_mlme_set_no_chans_available() - Set no_chans_available flag.
@@ -160,51 +160,51 @@ int dfs_mlme_ieee2mhz(struct wlan_objmgr_pdev *pdev,
* @ieee: Channel number.
* @des_cfreq2: cfreq2
* @mode: Phymode
* @ic_freq: Frequency in Mhz.
* @ic_flags: Channel flags.
* @ic_flagext: Extended channel flags.
* @ic_ieee: IEEE channel number.
* @ic_vhtop_ch_freq_seg1: Channel Center frequency.
* @ic_vhtop_ch_freq_seg2: Channel Center frequency applicable for 80+80MHz
* @dfs_ch_freq: Frequency in Mhz.
* @dfs_ch_flags: Channel flags.
* @dfs_ch_flagext: Extended channel flags.
* @dfs_ch_ieee: IEEE channel number.
* @dfs_ch_vhtop_ch_freq_seg1: Channel Center frequency.
* @dfs_ch_vhtop_ch_freq_seg2: Channel Center frequency applicable for 80+80MHz
* mode of operation.
*/
void dfs_mlme_find_dot11_channel(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint8_t des_cfreq2,
int mode,
uint16_t *ic_freq,
uint32_t *ic_flags,
uint16_t *ic_flagext,
uint8_t *ic_ieee,
uint8_t *ic_vhtop_ch_freq_seg1,
uint8_t *ic_vhtop_ch_freq_seg2);
uint16_t *dfs_ch_freq,
uint32_t *dfs_ch_flags,
uint16_t *dfs_ch_flagext,
uint8_t *dfs_ch_ieee,
uint8_t *dfs_ch_vhtop_ch_freq_seg1,
uint8_t *dfs_ch_vhtop_ch_freq_seg2);
/**
* dfs_mlme_get_ic_channels() - Get channel from channel list.
* dfs_mlme_get_dfs_ch_channels() - Get channel from channel list.
* @pdev: Pointer to DFS pdev object.
* @ic_freq: Frequency in Mhz.
* @ic_flags: Channel flags.
* @ic_flagext: Extended channel flags.
* @ic_ieee: IEEE channel number.
* @ic_vhtop_ch_freq_seg1: Channel Center frequency.
* @ic_vhtop_ch_freq_seg2: Channel Center frequency applicable for 80+80MHz
* @dfs_ch_freq: Frequency in Mhz.
* @dfs_ch_flags: Channel flags.
* @dfs_ch_flagext: Extended channel flags.
* @dfs_ch_ieee: IEEE channel number.
* @dfs_ch_vhtop_ch_freq_seg1: Channel Center frequency.
* @dfs_ch_vhtop_ch_freq_seg2: Channel Center frequency applicable for 80+80MHz
* mode of operation.
* @index: Index into channel list.
*/
void dfs_mlme_get_ic_channels(struct wlan_objmgr_pdev *pdev,
uint16_t *ic_freq,
uint32_t *ic_flags,
uint16_t *ic_flagext,
uint8_t *ic_ieee,
uint8_t *ic_vhtop_ch_freq_seg1,
uint8_t *ic_vhtop_ch_freq_seg2,
void dfs_mlme_get_dfs_ch_channels(struct wlan_objmgr_pdev *pdev,
uint16_t *dfs_ch_freq,
uint32_t *dfs_ch_flags,
uint16_t *dfs_ch_flagext,
uint8_t *dfs_ch_ieee,
uint8_t *dfs_ch_vhtop_ch_freq_seg1,
uint8_t *dfs_ch_vhtop_ch_freq_seg2,
int index);
/**
* dfs_mlme_ic_flags_ext() - Get extension channel flags.
* dfs_mlme_dfs_ch_flags_ext() - Get extension channel flags.
* @pdev: Pointer to DFS pdev object.
*/
uint32_t dfs_mlme_ic_flags_ext(struct wlan_objmgr_pdev *pdev);
uint32_t dfs_mlme_dfs_ch_flags_ext(struct wlan_objmgr_pdev *pdev);
/**
* dfs_mlme_channel_change_by_precac() - Channel change by PreCAC.
@@ -231,14 +231,14 @@ void dfs_mlme_clist_update(struct wlan_objmgr_pdev *pdev,
/**
* dfs_mlme_get_cac_timeout() - Get cac_timeout.
* @pdev: Pointer to DFS pdev object.
* @ic_freq: Frequency in Mhz.
* @ic_vhtop_ch_freq_seg2: Channel Center frequency applicable for 80+80MHz
* @dfs_ch_freq: Frequency in Mhz.
* @dfs_ch_vhtop_ch_freq_seg2: Channel Center frequency applicable for 80+80MHz
* mode of operation.
* @ic_flags: Channel flags.
* @dfs_ch_flags: Channel flags.
*/
int dfs_mlme_get_cac_timeout(struct wlan_objmgr_pdev *pdev,
uint16_t ic_freq,
uint8_t ic_vhtop_ch_freq_seg2,
uint32_t ic_flags);
uint16_t dfs_ch_freq,
uint8_t dfs_ch_vhtop_ch_freq_seg2,
uint32_t dfs_ch_flags);
#endif /* _WLAN_DFS_MLME_API_H_ */

24
umac/dfs/dispatcher/inc/wlan_dfs_tgt_api.h
ファイルの表示

@@ -34,20 +34,20 @@ extern struct dfs_to_mlme global_dfs_to_mlme;
* tgt_dfs_set_current_channel() - Fill dfs channel structure from
* dfs_ieee80211_channel structure.
* @pdev: Pointer to DFS pdev object.
* @ic_freq: Frequency in Mhz.
* @ic_flags: Channel flags.
* @ic_flagext: Extended channel flags.
* @ic_ieee: IEEE channel number.
* @ic_vhtop_ch_freq_seg1: Channel Center frequency1.
* @ic_vhtop_ch_freq_seg2: Channel Center frequency2.
* @dfs_ch_freq: Frequency in Mhz.
* @dfs_ch_flags: Channel flags.
* @dfs_ch_flagext: Extended channel flags.
* @dfs_ch_ieee: IEEE channel number.
* @dfs_ch_vhtop_ch_freq_seg1: Channel Center frequency1.
* @dfs_ch_vhtop_ch_freq_seg2: Channel Center frequency2.
*/
QDF_STATUS tgt_dfs_set_current_channel(struct wlan_objmgr_pdev *pdev,
uint16_t ic_freq,
uint32_t ic_flags,
uint16_t ic_flagext,
uint8_t ic_ieee,
uint8_t ic_vhtop_ch_freq_seg1,
uint8_t ic_vhtop_ch_freq_seg2);
uint16_t dfs_ch_freq,
uint32_t dfs_ch_flags,
uint16_t dfs_ch_flagext,
uint8_t dfs_ch_ieee,
uint8_t dfs_ch_vhtop_ch_freq_seg1,
uint8_t dfs_ch_vhtop_ch_freq_seg2);
/**
* tgt_dfs_reset() - DFS reset

58
umac/dfs/dispatcher/inc/wlan_dfs_ucfg_api.h
ファイルの表示

@@ -40,18 +40,18 @@
* @mlme_proc_cac: Process the CAC completion event.
* @mlme_deliver_event_up_afrer_cac: Send a CAC timeout, VAP up event to user
* space
* @mlme_get_ic_nchans: Get number of channels in the channel
* @mlme_get_dfs_ch_nchans: Get number of channels in the channel
* list.
* @mlme_get_ic_no_weather_radar_chan: Checks is the channel is weather radar
* channel.
* @mlme_get_dfs_ch_no_weather_radar_chan: Checks is the channel is weather
* radar channel.
* @mlme_find_alternate_mode_channel: Finds the channel.
* @mlme_find_any_valid_channel: Find the valid channeil.
* @mlme_get_extchan: Gets the extension channel.
* @mlme_set_no_chans_available: Sets no_chans_available flag.
* @mlme_ieee2mhz: Gets Channel freq from ieee number.
* @mlme_find_dot11_channel: Find dot11 channel.
* @mlme_get_ic_channels: Get the channel list.
* @mlme_ic_flags_ext: Gets channel extension flag.
* @mlme_get_dfs_ch_channels: Get the channel list.
* @mlme_dfs_ch_flags_ext: Gets channel extension flag.
* @mlme_channel_change_by_precac: Channel change triggered by PreCAC.
* @mlme_nol_timeout_notification: NOL timeout notification.
* @mlme_clist_update: Updates the channel list.
@@ -82,9 +82,9 @@ struct dfs_to_mlme {
QDF_STATUS (*mlme_proc_cac)(struct wlan_objmgr_pdev *pdev);
QDF_STATUS (*mlme_deliver_event_up_afrer_cac)(
struct wlan_objmgr_pdev *pdev);
QDF_STATUS (*mlme_get_ic_nchans)(struct wlan_objmgr_pdev *pdev,
QDF_STATUS (*mlme_get_dfs_ch_nchans)(struct wlan_objmgr_pdev *pdev,
int *nchans);
QDF_STATUS (*mlme_get_ic_no_weather_radar_chan)(
QDF_STATUS (*mlme_get_dfs_ch_no_weather_radar_chan)(
struct wlan_objmgr_pdev *pdev,
uint8_t *no_wradar);
QDF_STATUS (*mlme_find_alternate_mode_channel)(
@@ -97,12 +97,12 @@ struct dfs_to_mlme {
uint32_t chan_mode,
int *ret_val);
QDF_STATUS (*mlme_get_extchan)(struct wlan_objmgr_pdev *pdev,
uint16_t *ic_freq,
uint32_t *ic_flags,
uint16_t *ic_flagext,
uint8_t *ic_ieee,
uint8_t *ic_vhtop_ch_freq_seg1,
uint8_t *ic_vhtop_ch_freq_seg2);
uint16_t *dfs_ch_freq,
uint32_t *dfs_ch_flags,
uint16_t *dfs_ch_flagext,
uint8_t *dfs_ch_ieee,
uint8_t *dfs_ch_vhtop_ch_freq_seg1,
uint8_t *dfs_ch_vhtop_ch_freq_seg2);
QDF_STATUS (*mlme_set_no_chans_available)(struct wlan_objmgr_pdev *pdev,
int val);
QDF_STATUS (*mlme_ieee2mhz)(struct wlan_objmgr_pdev *pdev,
@@ -113,22 +113,22 @@ struct dfs_to_mlme {
uint8_t ieee,
uint8_t des_cfreq2,
int mode,
uint16_t *ic_freq,
uint32_t *ic_flags,
uint16_t *ic_flagext,
uint8_t *ic_ieee,
uint8_t *ic_vhtop_ch_freq_seg1,
uint8_t *ic_vhtop_ch_freq_seg2);
uint16_t *dfs_ch_freq,
uint32_t *dfs_ch_flags,
uint16_t *dfs_ch_flagext,
uint8_t *dfs_ch_ieee,
uint8_t *dfs_ch_vhtop_ch_freq_seg1,
uint8_t *dfs_ch_vhtop_ch_freq_seg2);
QDF_STATUS (*mlme_get_ic_channels)(struct wlan_objmgr_pdev *pdev,
uint16_t *ic_freq,
uint32_t *ic_flags,
uint16_t *ic_flagext,
uint8_t *ic_ieee,
uint8_t *ic_vhtop_ch_freq_seg1,
uint8_t *ic_vhtop_ch_freq_seg2,
QDF_STATUS (*mlme_get_dfs_ch_channels)(struct wlan_objmgr_pdev *pdev,
uint16_t *dfs_ch_freq,
uint32_t *dfs_ch_flags,
uint16_t *dfs_ch_flagext,
uint8_t *dfs_ch_ieee,
uint8_t *dfs_ch_vhtop_ch_freq_seg1,
uint8_t *dfs_ch_vhtop_ch_freq_seg2,
int index);
QDF_STATUS (*mlme_ic_flags_ext)(struct wlan_objmgr_pdev *pdev,
QDF_STATUS (*mlme_dfs_ch_flags_ext)(struct wlan_objmgr_pdev *pdev,
uint32_t *flag_ext);
QDF_STATUS (*mlme_channel_change_by_precac)(
struct wlan_objmgr_pdev *pdev);
@@ -138,9 +138,9 @@ struct dfs_to_mlme {
void *nollist,
int nentries);
QDF_STATUS (*mlme_get_cac_timeout)(struct wlan_objmgr_pdev *pdev,
uint16_t ic_freq,
uint16_t dfs_ch_freq,
uint8_t c_vhtop_ch_freq_seg2,
uint32_t ic_flags,
uint32_t dfs_ch_flags,
int *cac_timeout);
};

11
umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c
ファイルの表示

@@ -64,9 +64,9 @@ void register_dfs_callbacks(void)
tmp_dfs_to_mlme->mlme_proc_cac = mlme_dfs_proc_cac;
tmp_dfs_to_mlme->mlme_deliver_event_up_afrer_cac =
mlme_dfs_deliver_event_up_afrer_cac;
tmp_dfs_to_mlme->mlme_get_ic_nchans = mlme_dfs_get_ic_nchans;
tmp_dfs_to_mlme->mlme_get_ic_no_weather_radar_chan =
mlme_dfs_get_ic_no_weather_radar_chan;
tmp_dfs_to_mlme->mlme_get_dfs_ch_nchans = mlme_dfs_get_dfs_ch_nchans;
tmp_dfs_to_mlme->mlme_get_dfs_ch_no_weather_radar_chan =
mlme_dfs_get_dfs_ch_no_weather_radar_chan;
tmp_dfs_to_mlme->mlme_find_alternate_mode_channel =
mlme_dfs_find_alternate_mode_channel;
tmp_dfs_to_mlme->mlme_find_any_valid_channel =
@@ -76,8 +76,9 @@ void register_dfs_callbacks(void)
mlme_dfs_set_no_chans_available;
tmp_dfs_to_mlme->mlme_ieee2mhz = mlme_dfs_ieee2mhz;
tmp_dfs_to_mlme->mlme_find_dot11_channel = mlme_dfs_find_dot11_channel;
tmp_dfs_to_mlme->mlme_get_ic_channels = mlme_dfs_get_ic_channels;
tmp_dfs_to_mlme->mlme_ic_flags_ext = mlme_dfs_ic_flags_ext;
tmp_dfs_to_mlme->mlme_get_dfs_ch_channels =
mlme_dfs_get_dfs_ch_channels;
tmp_dfs_to_mlme->mlme_dfs_ch_flags_ext = mlme_dfs_dfs_ch_flags_ext;
tmp_dfs_to_mlme->mlme_channel_change_by_precac =
mlme_dfs_channel_change_by_precac;
tmp_dfs_to_mlme->mlme_nol_timeout_notification =

108
umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c
ファイルの表示

@@ -130,19 +130,19 @@ void dfs_mlme_deliver_event_up_afrer_cac(struct wlan_objmgr_pdev *pdev)
pdev);
}
void dfs_mlme_get_ic_nchans(struct wlan_objmgr_pdev *pdev,
void dfs_mlme_get_dfs_ch_nchans(struct wlan_objmgr_pdev *pdev,
int *nchans)
{
if (global_dfs_to_mlme.mlme_get_ic_nchans != NULL)
global_dfs_to_mlme.mlme_get_ic_nchans(pdev,
if (global_dfs_to_mlme.mlme_get_dfs_ch_nchans != NULL)
global_dfs_to_mlme.mlme_get_dfs_ch_nchans(pdev,
nchans);
}
void dfs_mlme_get_ic_no_weather_radar_chan(struct wlan_objmgr_pdev *pdev,
void dfs_mlme_get_dfs_ch_no_weather_radar_chan(struct wlan_objmgr_pdev *pdev,
uint8_t *no_wradar)
{
if (global_dfs_to_mlme.mlme_get_ic_no_weather_radar_chan != NULL)
global_dfs_to_mlme.mlme_get_ic_no_weather_radar_chan(
if (global_dfs_to_mlme.mlme_get_dfs_ch_no_weather_radar_chan != NULL)
global_dfs_to_mlme.mlme_get_dfs_ch_no_weather_radar_chan(
pdev,
no_wradar);
}
@@ -173,21 +173,21 @@ void dfs_mlme_find_any_valid_channel(struct wlan_objmgr_pdev *pdev,
}
QDF_STATUS dfs_mlme_get_extchan(struct wlan_objmgr_pdev *pdev,
uint16_t *ic_freq,
uint32_t *ic_flags,
uint16_t *ic_flagext,
uint8_t *ic_ieee,
uint8_t *ic_vhtop_ch_freq_seg1,
uint8_t *ic_vhtop_ch_freq_seg2)
uint16_t *dfs_ch_freq,
uint32_t *dfs_ch_flags,
uint16_t *dfs_ch_flagext,
uint8_t *dfs_ch_ieee,
uint8_t *dfs_ch_vhtop_ch_freq_seg1,
uint8_t *dfs_ch_vhtop_ch_freq_seg2)
{
if (global_dfs_to_mlme.mlme_get_extchan != NULL)
return global_dfs_to_mlme.mlme_get_extchan(pdev,
ic_freq,
ic_flags,
ic_flagext,
ic_ieee,
ic_vhtop_ch_freq_seg1,
ic_vhtop_ch_freq_seg2);
dfs_ch_freq,
dfs_ch_flags,
dfs_ch_flagext,
dfs_ch_ieee,
dfs_ch_vhtop_ch_freq_seg1,
dfs_ch_vhtop_ch_freq_seg2);
return QDF_STATUS_E_FAILURE;
}
@@ -218,52 +218,52 @@ void dfs_mlme_find_dot11_channel(struct wlan_objmgr_pdev *pdev,
uint8_t ieee,
uint8_t des_cfreq2,
int mode,
uint16_t *ic_freq,
uint32_t *ic_flags,
uint16_t *ic_flagext,
uint8_t *ic_ieee,
uint8_t *ic_vhtop_ch_freq_seg1,
uint8_t *ic_vhtop_ch_freq_seg2)
uint16_t *dfs_ch_freq,
uint32_t *dfs_ch_flags,
uint16_t *dfs_ch_flagext,
uint8_t *dfs_ch_ieee,
uint8_t *dfs_ch_vhtop_ch_freq_seg1,
uint8_t *dfs_ch_vhtop_ch_freq_seg2)
{
if (global_dfs_to_mlme.mlme_find_dot11_channel != NULL)
global_dfs_to_mlme.mlme_find_dot11_channel(pdev,
ieee,
des_cfreq2,
mode,
ic_freq,
ic_flags,
ic_flagext,
ic_ieee,
ic_vhtop_ch_freq_seg1,
ic_vhtop_ch_freq_seg2);
dfs_ch_freq,
dfs_ch_flags,
dfs_ch_flagext,
dfs_ch_ieee,
dfs_ch_vhtop_ch_freq_seg1,
dfs_ch_vhtop_ch_freq_seg2);
}
void dfs_mlme_get_ic_channels(struct wlan_objmgr_pdev *pdev,
uint16_t *ic_freq,
uint32_t *ic_flags,
uint16_t *ic_flagext,
uint8_t *ic_ieee,
uint8_t *ic_vhtop_ch_freq_seg1,
uint8_t *ic_vhtop_ch_freq_seg2,
void dfs_mlme_get_dfs_ch_channels(struct wlan_objmgr_pdev *pdev,
uint16_t *dfs_ch_freq,
uint32_t *dfs_ch_flags,
uint16_t *dfs_ch_flagext,
uint8_t *dfs_ch_ieee,
uint8_t *dfs_ch_vhtop_ch_freq_seg1,
uint8_t *dfs_ch_vhtop_ch_freq_seg2,
int index)
{
if (global_dfs_to_mlme.mlme_get_ic_channels != NULL)
global_dfs_to_mlme.mlme_get_ic_channels(pdev,
ic_freq,
ic_flags,
ic_flagext,
ic_ieee,
ic_vhtop_ch_freq_seg1,
ic_vhtop_ch_freq_seg2,
if (global_dfs_to_mlme.mlme_get_dfs_ch_channels != NULL)
global_dfs_to_mlme.mlme_get_dfs_ch_channels(pdev,
dfs_ch_freq,
dfs_ch_flags,
dfs_ch_flagext,
dfs_ch_ieee,
dfs_ch_vhtop_ch_freq_seg1,
dfs_ch_vhtop_ch_freq_seg2,
index);
}
uint32_t dfs_mlme_ic_flags_ext(struct wlan_objmgr_pdev *pdev)
uint32_t dfs_mlme_dfs_ch_flags_ext(struct wlan_objmgr_pdev *pdev)
{
uint32_t flag_ext = 0;
if (global_dfs_to_mlme.mlme_ic_flags_ext != NULL)
global_dfs_to_mlme.mlme_ic_flags_ext(pdev,
if (global_dfs_to_mlme.mlme_dfs_ch_flags_ext != NULL)
global_dfs_to_mlme.mlme_dfs_ch_flags_ext(pdev,
&flag_ext);
return flag_ext;
@@ -294,17 +294,17 @@ void dfs_mlme_clist_update(struct wlan_objmgr_pdev *pdev,
}
int dfs_mlme_get_cac_timeout(struct wlan_objmgr_pdev *pdev,
uint16_t ic_freq,
uint8_t ic_vhtop_ch_freq_seg2,
uint32_t ic_flags)
uint16_t dfs_ch_freq,
uint8_t dfs_ch_vhtop_ch_freq_seg2,
uint32_t dfs_ch_flags)
{
int cac_timeout = 0;
if (global_dfs_to_mlme.mlme_get_cac_timeout != NULL)
global_dfs_to_mlme.mlme_get_cac_timeout(pdev,
ic_freq,
ic_vhtop_ch_freq_seg2,
ic_flags,
dfs_ch_freq,
dfs_ch_vhtop_ch_freq_seg2,
dfs_ch_flags,
&cac_timeout);
return cac_timeout;

29
umac/dfs/dispatcher/src/wlan_dfs_tgt_api.c
ファイルの表示

@@ -36,12 +36,12 @@ wlan_psoc_get_dfs_txops(struct wlan_objmgr_psoc *psoc)
}
QDF_STATUS tgt_dfs_set_current_channel(struct wlan_objmgr_pdev *pdev,
uint16_t ic_freq,
uint32_t ic_flags,
uint16_t ic_flagext,
uint8_t ic_ieee,
uint8_t ic_vhtop_ch_freq_seg1,
uint8_t ic_vhtop_ch_freq_seg2)
uint16_t dfs_ch_freq,
uint32_t dfs_ch_flags,
uint16_t dfs_ch_flagext,
uint8_t dfs_ch_ieee,
uint8_t dfs_ch_vhtop_ch_freq_seg1,
uint8_t dfs_ch_vhtop_ch_freq_seg2)
{
struct wlan_dfs *dfs;
@@ -49,8 +49,13 @@ QDF_STATUS tgt_dfs_set_current_channel(struct wlan_objmgr_pdev *pdev,
if (dfs == NULL)
return QDF_STATUS_E_FAILURE;
dfs_set_current_channel(dfs, ic_freq, ic_flags, ic_flagext, ic_ieee,
ic_vhtop_ch_freq_seg1, ic_vhtop_ch_freq_seg2);
dfs_set_current_channel(dfs,
dfs_ch_freq,
dfs_ch_flags,
dfs_ch_flagext,
dfs_ch_ieee,
dfs_ch_vhtop_ch_freq_seg1,
dfs_ch_vhtop_ch_freq_seg2);
return QDF_STATUS_SUCCESS;
}
@@ -253,10 +258,10 @@ QDF_STATUS tgt_dfs_process_radar_ind(struct wlan_objmgr_pdev *pdev,
}
dfs_process_radar_found_indication(dfs, radar_found);
dfs_mlme_mark_dfs(pdev, dfs->dfs_curchan->ic_ieee,
dfs->dfs_curchan->ic_freq,
dfs->dfs_curchan->ic_vhtop_ch_freq_seg2,
dfs->dfs_curchan->ic_flags);
dfs_mlme_mark_dfs(pdev, dfs->dfs_curchan->dfs_ch_ieee,
dfs->dfs_curchan->dfs_ch_freq,
dfs->dfs_curchan->dfs_ch_vhtop_ch_freq_seg2,
dfs->dfs_curchan->dfs_ch_flags);
return QDF_STATUS_SUCCESS;
}

13
umac/dfs/dispatcher/src/wlan_dfs_utils_api.c
ファイルの表示

@@ -465,8 +465,9 @@ static void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev,
}
for (i = 0; i < len; i++) {
chan_list[i].ic_ieee = pcl_ch[i];
chan_list[i].ic_freq = wlan_reg_chan_to_freq(pdev, pcl_ch[i]);
chan_list[i].dfs_ch_ieee = pcl_ch[i];
chan_list[i].dfs_ch_freq =
wlan_reg_chan_to_freq(pdev, pcl_ch[i]);
}
*num_chan = i;
DFS_PRINTK("%s: num channels %d\n", __func__, i);
@@ -517,8 +518,8 @@ QDF_STATUS dfs_get_random_channel(
goto random_chan_error;
}
cur_chan.ic_vhtop_ch_freq_seg1 = ch_params->center_freq_seg0;
cur_chan.ic_vhtop_ch_freq_seg2 = ch_params->center_freq_seg1;
cur_chan.dfs_ch_vhtop_ch_freq_seg1 = ch_params->center_freq_seg0;
cur_chan.dfs_ch_vhtop_ch_freq_seg2 = ch_params->center_freq_seg1;
if (!ch_params->ch_width)
utils_dfs_get_max_sup_width(pdev,
@@ -528,8 +529,8 @@ QDF_STATUS dfs_get_random_channel(
num_chan, flags, (uint8_t *)&ch_params->ch_width,
&cur_chan, (uint8_t)dfs_reg, acs_info);
ch_params->center_freq_seg0 = cur_chan.ic_vhtop_ch_freq_seg1;
ch_params->center_freq_seg1 = cur_chan.ic_vhtop_ch_freq_seg2;
ch_params->center_freq_seg0 = cur_chan.dfs_ch_vhtop_ch_freq_seg1;
ch_params->center_freq_seg1 = cur_chan.dfs_ch_vhtop_ch_freq_seg2;
DFS_PRINTK("%s: input width=%d\n", __func__, ch_params->ch_width);
if (*target_chan) {