Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-01-19 03:14:05 -05:00
Code Issues Projects Releases Wiki Activity

HE: Remove vht_ prefix from shared set_freq argument

Browse Source 
oper_chwidth is used for both VHT and HE here.

Signed-off-by: Shashidhar Lakkavalli <slakkavalli@datto.com>
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2019-05-20 09:55:07 +02:00 committed by Jouni Malinen
parent 464dcfd030
commit b04e43086b
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ap/ap_drv_ops.c
View File

@ -537,14 +537,14 @@ int hostapd_flush(struct hostapd_data *hapd)
int hostapd_set_freq(struct hostapd_data *hapd, enum hostapd_hw_mode mode, int hostapd_set_freq(struct hostapd_data *hapd, enum hostapd_hw_mode mode,
int freq, int channel, int ht_enabled, int vht_enabled, int freq, int channel, int ht_enabled, int vht_enabled,
int sec_channel_offset, int vht_oper_chwidth, int sec_channel_offset, int oper_chwidth,
int center_segment0, int center_segment1) int center_segment0, int center_segment1)
{ {
struct hostapd_freq_params data; struct hostapd_freq_params data;
if (hostapd_set_freq_params(&data, mode, freq, channel, ht_enabled, if (hostapd_set_freq_params(&data, mode, freq, channel, ht_enabled,
vht_enabled, sec_channel_offset, vht_enabled, sec_channel_offset,
vht_oper_chwidth, oper_chwidth,
center_segment0, center_segment1, center_segment0, center_segment1,
hapd->iface->current_mode ? hapd->iface->current_mode ?
hapd->iface->current_mode->vht_capab : 0)) hapd->iface->current_mode->vht_capab : 0))
@ -785,7 +785,7 @@ int hostapd_drv_send_action_addr3_ap(struct hostapd_data *hapd,
int hostapd_start_dfs_cac(struct hostapd_iface *iface, int hostapd_start_dfs_cac(struct hostapd_iface *iface,
enum hostapd_hw_mode mode, int freq, enum hostapd_hw_mode mode, int freq,
int channel, int ht_enabled, int vht_enabled, int channel, int ht_enabled, int vht_enabled,
int sec_channel_offset, int vht_oper_chwidth, int sec_channel_offset, int oper_chwidth,
int center_segment0, int center_segment1) int center_segment0, int center_segment1)
{ {
struct hostapd_data *hapd = iface->bss[0]; struct hostapd_data *hapd = iface->bss[0];
@ -803,7 +803,7 @@ int hostapd_start_dfs_cac(struct hostapd_iface *iface,
if (hostapd_set_freq_params(&data, mode, freq, channel, ht_enabled, if (hostapd_set_freq_params(&data, mode, freq, channel, ht_enabled,
vht_enabled, sec_channel_offset, vht_enabled, sec_channel_offset,
vht_oper_chwidth, center_segment0, oper_chwidth, center_segment0,
center_segment1, center_segment1,
iface->current_mode->vht_capab)) { iface->current_mode->vht_capab)) {
wpa_printf(MSG_ERROR, "Can't set freq params"); wpa_printf(MSG_ERROR, "Can't set freq params");

4
src/ap/ap_drv_ops.h
View File

@ -61,7 +61,7 @@ int hostapd_get_seqnum(const char *ifname, struct hostapd_data *hapd,
int hostapd_flush(struct hostapd_data *hapd); int hostapd_flush(struct hostapd_data *hapd);
int hostapd_set_freq(struct hostapd_data *hapd, enum hostapd_hw_mode mode, int hostapd_set_freq(struct hostapd_data *hapd, enum hostapd_hw_mode mode,
int freq, int channel, int ht_enabled, int vht_enabled, int freq, int channel, int ht_enabled, int vht_enabled,
int sec_channel_offset, int vht_oper_chwidth, int sec_channel_offset, int oper_chwidth,
int center_segment0, int center_segment1); int center_segment0, int center_segment1);
int hostapd_set_rts(struct hostapd_data *hapd, int rts); int hostapd_set_rts(struct hostapd_data *hapd, int rts);
int hostapd_set_frag(struct hostapd_data *hapd, int frag); int hostapd_set_frag(struct hostapd_data *hapd, int frag);
@ -124,7 +124,7 @@ int hostapd_add_tspec(struct hostapd_data *hapd, const u8 *addr,
int hostapd_start_dfs_cac(struct hostapd_iface *iface, int hostapd_start_dfs_cac(struct hostapd_iface *iface,
enum hostapd_hw_mode mode, int freq, enum hostapd_hw_mode mode, int freq,
int channel, int ht_enabled, int vht_enabled, int channel, int ht_enabled, int vht_enabled,
int sec_channel_offset, int vht_oper_chwidth, int sec_channel_offset, int oper_chwidth,
int center_segment0, int center_segment1); int center_segment0, int center_segment1);
int hostapd_drv_do_acs(struct hostapd_data *hapd); int hostapd_drv_do_acs(struct hostapd_data *hapd);

8
src/common/hw_features_common.c
View File

@ -362,7 +362,7 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
enum hostapd_hw_mode mode, enum hostapd_hw_mode mode,
int freq, int channel, int ht_enabled, int freq, int channel, int ht_enabled,
int vht_enabled, int sec_channel_offset, int vht_enabled, int sec_channel_offset,
int vht_oper_chwidth, int center_segment0, int oper_chwidth, int center_segment0,
int center_segment1, u32 vht_caps) int center_segment1, u32 vht_caps)
{ {
os_memset(data, 0, sizeof(*data)); os_memset(data, 0, sizeof(*data));
@ -376,7 +376,7 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
data->center_freq2 = 0; data->center_freq2 = 0;
data->bandwidth = sec_channel_offset ? 40 : 20; data->bandwidth = sec_channel_offset ? 40 : 20;
if (data->vht_enabled) switch (vht_oper_chwidth) { if (data->vht_enabled) switch (oper_chwidth) {
case CHANWIDTH_USE_HT: case CHANWIDTH_USE_HT:
if (center_segment1 || if (center_segment1 ||
(center_segment0 != 0 && (center_segment0 != 0 &&
@ -397,9 +397,9 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
/* fall through */ /* fall through */
case CHANWIDTH_80MHZ: case CHANWIDTH_80MHZ:
data->bandwidth = 80; data->bandwidth = 80;
if ((vht_oper_chwidth == CHANWIDTH_80MHZ && if ((oper_chwidth == CHANWIDTH_80MHZ &&
center_segment1) || center_segment1) ||
(vht_oper_chwidth == CHANWIDTH_80P80MHZ && (oper_chwidth == CHANWIDTH_80P80MHZ &&
!center_segment1) || !center_segment1) ||
!sec_channel_offset) !sec_channel_offset)
return -1; return -1;

2
src/common/hw_features_common.h
View File

@ -33,7 +33,7 @@ int hostapd_set_freq_params(struct hostapd_freq_params *data,
enum hostapd_hw_mode mode, enum hostapd_hw_mode mode,
int freq, int channel, int ht_enabled, int freq, int channel, int ht_enabled,
int vht_enabled, int sec_channel_offset, int vht_enabled, int sec_channel_offset,
int vht_oper_chwidth, int center_segment0, int oper_chwidth, int center_segment0,
int center_segment1, u32 vht_caps); int center_segment1, u32 vht_caps);
void set_disable_ht40(struct ieee80211_ht_capabilities *htcaps, void set_disable_ht40(struct ieee80211_ht_capabilities *htcaps,
int disabled); int disabled);