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

Show disabled HT/VHT properly in AP mode STATUS command

Browse source 
Previously, HT/VHT state was shown in STATUS based on the configuration
parameter instead of the runtime operational parameters. This could
result in claiming HT/VHT to be enabled even when it was forced to be
disabled due to an incompatible configuration. Clear HT/VHT information
in the STATUS output if HT/VHT has been disabled.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2016-08-02 17:41:01 +03:00 committed by Jouni Malinen
parent 551817a582
commit 5a5638a3bf
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/ap/ctrl_iface_ap.c
View file

@ -514,20 +514,28 @@ int hostapd_ctrl_iface_status(struct hostapd_data *hapd, char *buf,
"channel=%u\n" "channel=%u\n"
"secondary_channel=%d\n" "secondary_channel=%d\n"
"ieee80211n=%d\n" "ieee80211n=%d\n"
"ieee80211ac=%d\n" "ieee80211ac=%d\n",
"vht_oper_chwidth=%d\n"
"vht_oper_centr_freq_seg0_idx=%d\n"
"vht_oper_centr_freq_seg1_idx=%d\n",
iface->conf->channel, iface->conf->channel,
iface->conf->secondary_channel, iface->conf->ieee80211n && !hapd->conf->disable_11n ?
iface->conf->ieee80211n, iface->conf->secondary_channel : 0,
iface->conf->ieee80211ac, iface->conf->ieee80211n && !hapd->conf->disable_11n,
iface->conf->vht_oper_chwidth, iface->conf->ieee80211ac &&
iface->conf->vht_oper_centr_freq_seg0_idx, !hapd->conf->disable_11ac);
iface->conf->vht_oper_centr_freq_seg1_idx);
if (os_snprintf_error(buflen - len, ret)) if (os_snprintf_error(buflen - len, ret))
return len; return len;
len += ret; len += ret;
if (iface->conf->ieee80211ac && !hapd->conf->disable_11ac) {
ret = os_snprintf(buf + len, buflen - len,
"vht_oper_chwidth=%d\n"
"vht_oper_centr_freq_seg0_idx=%d\n"
"vht_oper_centr_freq_seg1_idx=%d\n",
iface->conf->vht_oper_chwidth,
iface->conf->vht_oper_centr_freq_seg0_idx,
iface->conf->vht_oper_centr_freq_seg1_idx);
if (os_snprintf_error(buflen - len, ret))
return len;
len += ret;
}
for (i = 0; i < iface->num_bss; i++) { for (i = 0; i < iface->num_bss; i++) {
struct hostapd_data *bss = iface->bss[i]; struct hostapd_data *bss = iface->bss[i];