jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

hostapd: Generalize channel switch methods to incorperated HE mode

Browse source 
Remove the VHT specific naming on methods that are utilized in both VHT
and HE modes.

Signed-off-by: Muna Sinada <msinada@codeaurora.org>
This commit is contained in:
Muna Sinada 2020-06-11 04:18:43 -07:00 committed by Jouni Malinen
parent 2908dc91c1
commit 2acfd15a2a
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hostapd/ctrl_iface.c
View file

@ -2680,9 +2680,9 @@ static int hostapd_ctrl_iface_chan_switch(struct hostapd_iface *iface,
for (i = 0; i < iface->num_bss; i++) { for (i = 0; i < iface->num_bss; i++) {
/* Save CHAN_SWITCH VHT config */ /* Save CHAN_SWITCH VHT and HE config */
hostapd_chan_switch_vht_config( hostapd_chan_switch_config(iface->bss[i],
iface->bss[i], settings.freq_params.vht_enabled); &settings.freq_params);
ret = hostapd_switch_channel(iface->bss[i], &settings); ret = hostapd_switch_channel(iface->bss[i], &settings);
if (ret) { if (ret) {

14
src/ap/hostapd.c
View file

@ -3557,15 +3557,23 @@ void hostapd_cleanup_cs_params(struct hostapd_data *hapd)
} }
void hostapd_chan_switch_vht_config(struct hostapd_data *hapd, int vht_enabled) void hostapd_chan_switch_config(struct hostapd_data *hapd,
struct hostapd_freq_params *freq_params)
{ {
if (vht_enabled) if (freq_params->he_enabled)
hapd->iconf->ch_switch_he_config |= CH_SWITCH_HE_ENABLED;
else
hapd->iconf->ch_switch_he_config |= CH_SWITCH_HE_DISABLED;
if (freq_params->vht_enabled)
hapd->iconf->ch_switch_vht_config |= CH_SWITCH_VHT_ENABLED; hapd->iconf->ch_switch_vht_config |= CH_SWITCH_VHT_ENABLED;
else else
hapd->iconf->ch_switch_vht_config |= CH_SWITCH_VHT_DISABLED; hapd->iconf->ch_switch_vht_config |= CH_SWITCH_VHT_DISABLED;
hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211, hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_INFO, "CHAN_SWITCH VHT CONFIG 0x%x", HOSTAPD_LEVEL_INFO,
"CHAN_SWITCH HE config 0x%x VHT config 0x%x",
hapd->iconf->ch_switch_he_config,
hapd->iconf->ch_switch_vht_config); hapd->iconf->ch_switch_vht_config);
} }

3
src/ap/hostapd.h
View file

@ -631,7 +631,8 @@ void hostapd_channel_list_updated(struct hostapd_iface *iface, int initiator);
void hostapd_set_state(struct hostapd_iface *iface, enum hostapd_iface_state s); void hostapd_set_state(struct hostapd_iface *iface, enum hostapd_iface_state s);
const char * hostapd_state_text(enum hostapd_iface_state s); const char * hostapd_state_text(enum hostapd_iface_state s);
int hostapd_csa_in_progress(struct hostapd_iface *iface); int hostapd_csa_in_progress(struct hostapd_iface *iface);
void hostapd_chan_switch_vht_config(struct hostapd_data *hapd, int vht_enabled); void hostapd_chan_switch_config(struct hostapd_data *hapd,
struct hostapd_freq_params *freq_params);
int hostapd_switch_channel(struct hostapd_data *hapd, int hostapd_switch_channel(struct hostapd_data *hapd,
struct csa_settings *settings); struct csa_settings *settings);
void void