HE: Enable ACS similarly to VHT

Signed-off-by: Shashidhar Lakkavalli <slakkavalli@datto.com>
Signed-off-by: John Crispin <john@phrozen.org>

diff --git a/src/ap/acs.c b/src/ap/acs.c
index 7863ae9b8ab406b1592c60ad6c1de1ebf9a50be5..11178a1f047c9a853880c8acb0458477578e9f84 100644 (file)
--- a/src/ap/acs.c
+++ b/src/ap/acs.c
@@ -594,7 +594,7 @@ acs_find_ideal_chan(struct hostapd_iface *iface)
            iface->conf->secondary_channel)
                n_chans = 2;
 
-       if (iface->conf->ieee80211ac) {
+       if (iface->conf->ieee80211ac || iface->conf->ieee80211ax) {
                switch (hostapd_get_oper_chwidth(iface->conf)) {
                case CHANWIDTH_80MHZ:
                        n_chans = 4;
@@ -607,7 +607,7 @@ acs_find_ideal_chan(struct hostapd_iface *iface)
 
        bw = num_chan_to_bw(n_chans);
 
-       /* TODO: VHT80+80. Update acs_adjust_center_freq() too. */
+       /* TODO: VHT/HE80+80. Update acs_adjust_center_freq() too. */
 
        wpa_printf(MSG_DEBUG,
                   "ACS: Survey analysis for selected bandwidth %d MHz", bw);
@@ -647,7 +647,7 @@ acs_find_ideal_chan(struct hostapd_iface *iface)
                }
 
                if (iface->current_mode->mode == HOSTAPD_MODE_IEEE80211A &&
-                   iface->conf->ieee80211ac) {
+                   (iface->conf->ieee80211ac || iface->conf->ieee80211ax)) {
                        if (hostapd_get_oper_chwidth(iface->conf) ==
                            CHANWIDTH_80MHZ &&
                            !acs_usable_vht80_chan(chan)) {

diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index 9249762ca8b40d999bd1648a94234a94364aacdd..dced3371d84ea7ceea9ab05158d323ab9d416386 100644 (file)
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -939,7 +939,9 @@ int hostapd_drv_do_acs(struct hostapd_data *hapd)
 
        /* Note: VHT20 is defined by combination of ht_capab & oper_chwidth
         */
-       if (hapd->iface->conf->ieee80211ac && params.ht40_enabled) {
+       if ((hapd->iface->conf->ieee80211ax ||
+            hapd->iface->conf->ieee80211ac) &&
+           params.ht40_enabled) {
                u8 oper_chwidth = hostapd_get_oper_chwidth(hapd->iface->conf);
 
                if (oper_chwidth == CHANWIDTH_80MHZ)

diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 3c7bb6c43dde7d510ba7c2903565dcb0af34934a..104dc1cd7c0c99d1275e6d367b9199d648e6c7ad 100644 (file)
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -960,7 +960,7 @@ void hostapd_acs_channel_selected(struct hostapd_data *hapd,
                goto out;
        }
 
-       if (hapd->iface->conf->ieee80211ac) {
+       if (hapd->iface->conf->ieee80211ac || hapd->iface->conf->ieee80211ax) {
                /* set defaults for backwards compatibility */
                hostapd_set_oper_centr_freq_seg1_idx(hapd->iconf, 0);
                hostapd_set_oper_centr_freq_seg0_idx(hapd->iconf, 0);