HE: Remove vht_ prefix from CSA/bandwidth

Bandwidth 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 b04e43086b
commit f200631c35

View file

@ -3262,7 +3262,7 @@ static int hostapd_fill_csa_settings(struct hostapd_data *hapd,
struct hostapd_iface *iface = hapd->iface; struct hostapd_iface *iface = hapd->iface;
struct hostapd_freq_params old_freq; struct hostapd_freq_params old_freq;
int ret; int ret;
u8 chan, vht_bandwidth; u8 chan, bandwidth;
os_memset(&old_freq, 0, sizeof(old_freq)); os_memset(&old_freq, 0, sizeof(old_freq));
if (!iface || !iface->freq || hapd->csa_in_progress) if (!iface || !iface->freq || hapd->csa_in_progress)
@ -3271,22 +3271,22 @@ static int hostapd_fill_csa_settings(struct hostapd_data *hapd,
switch (settings->freq_params.bandwidth) { switch (settings->freq_params.bandwidth) {
case 80: case 80:
if (settings->freq_params.center_freq2) if (settings->freq_params.center_freq2)
vht_bandwidth = CHANWIDTH_80P80MHZ; bandwidth = CHANWIDTH_80P80MHZ;
else else
vht_bandwidth = CHANWIDTH_80MHZ; bandwidth = CHANWIDTH_80MHZ;
break; break;
case 160: case 160:
vht_bandwidth = CHANWIDTH_160MHZ; bandwidth = CHANWIDTH_160MHZ;
break; break;
default: default:
vht_bandwidth = CHANWIDTH_USE_HT; bandwidth = CHANWIDTH_USE_HT;
break; break;
} }
if (ieee80211_freq_to_channel_ext( if (ieee80211_freq_to_channel_ext(
settings->freq_params.freq, settings->freq_params.freq,
settings->freq_params.sec_channel_offset, settings->freq_params.sec_channel_offset,
vht_bandwidth, bandwidth,
&hapd->iface->cs_oper_class, &hapd->iface->cs_oper_class,
&chan) == NUM_HOSTAPD_MODES) { &chan) == NUM_HOSTAPD_MODES) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,