hostapd: Enable WMM automatically when HE is configured

If WMM is not set explicitly in the configuration, it can be set based
on HT/HE config. As HE can be used without HT/VHT (which was introduced
as a special behavior for the 6 GHz band), add a similar automatic
enabling of WMM for HE without HT.

Signed-off-by: Lavanya Suresh <lavaks@codeaurora.org>

diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 7bb0f097669bb36d4990cacfb2bb119f0ca60ba8..e9aae6dcf2f57ea0e0b1403cebb5fc5e65227ef0 100644 (file)
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -107,7 +107,8 @@ static void hostapd_reload_bss(struct hostapd_data *hapd)
                return;
 
        if (hapd->conf->wmm_enabled < 0)
-               hapd->conf->wmm_enabled = hapd->iconf->ieee80211n;
+               hapd->conf->wmm_enabled = hapd->iconf->ieee80211n |
+                       hapd->iconf->ieee80211ax;
 
 #ifndef CONFIG_NO_RADIUS
        radius_client_reconfig(hapd->radius, hapd->conf->radius);
@@ -1173,7 +1174,8 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
        }
 
        if (conf->wmm_enabled < 0)
-               conf->wmm_enabled = hapd->iconf->ieee80211n;
+               conf->wmm_enabled = hapd->iconf->ieee80211n |
+                       hapd->iconf->ieee80211ax;
 
 #ifdef CONFIG_IEEE80211R_AP
        if (is_zero_ether_addr(conf->r1_key_holder))