]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
HE: Remove vht_ prefix from CSA/bandwidth
authorJohn Crispin <john@phrozen.org>
Mon, 20 May 2019 07:55:07 +0000 (09:55 +0200)
committerJouni Malinen <j@w1.fi>
Mon, 27 May 2019 13:30:05 +0000 (16:30 +0300)
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>
src/ap/hostapd.c

index 9fce748f13f9170106444f40a8a286578fbaa701..4c3b959eba1379f3535bd2acb8ff8c449f8a4927 100644 (file)
@@ -3262,7 +3262,7 @@ static int hostapd_fill_csa_settings(struct hostapd_data *hapd,
        struct hostapd_iface *iface = hapd->iface;
        struct hostapd_freq_params old_freq;
        int ret;
-       u8 chan, vht_bandwidth;
+       u8 chan, bandwidth;
 
        os_memset(&old_freq, 0, sizeof(old_freq));
        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) {
        case 80:
                if (settings->freq_params.center_freq2)
-                       vht_bandwidth = CHANWIDTH_80P80MHZ;
+                       bandwidth = CHANWIDTH_80P80MHZ;
                else
-                       vht_bandwidth = CHANWIDTH_80MHZ;
+                       bandwidth = CHANWIDTH_80MHZ;
                break;
        case 160:
-               vht_bandwidth = CHANWIDTH_160MHZ;
+               bandwidth = CHANWIDTH_160MHZ;
                break;
        default:
-               vht_bandwidth = CHANWIDTH_USE_HT;
+               bandwidth = CHANWIDTH_USE_HT;
                break;
        }
 
        if (ieee80211_freq_to_channel_ext(
                    settings->freq_params.freq,
                    settings->freq_params.sec_channel_offset,
-                   vht_bandwidth,
+                   bandwidth,
                    &hapd->iface->cs_oper_class,
                    &chan) == NUM_HOSTAPD_MODES) {
                wpa_printf(MSG_DEBUG,