diff mbox

[3] Explicitly require WMM to be enabled if HE (11ax) is enabled.

Message ID CAGnO3dqRdae+cLmgwXTK0dfaQbdfneCnJ5oDV2zLJmsh+C-dTA@mail.gmail.com
State Changes Requested
Headers show

Commit Message

Nick Lowe Feb. 23, 2017, 4:43 p.m. UTC 
Explicitly require WMM to be enabled if HE (11ax) is enabled.

Signed-off-by Nick Lowe <nick.lowe@gmail.com>
---
 hostapd/hostapd.conf | 1 +
 src/ap/hostapd.c     | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

  }
diff mbox

Patch

diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index 96aed35..94d081a 100644
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -725,6 +725,7 @@  wmm_ac_vo_acm=0
 ##### IEEE 802.11ax related configuration #####################################

 #ieee80211ax: Whether IEEE 802.11ax (HE) is enabled
+# Note: You will also need to enable WMM for HE functionality.
 # 0 = disabled (default)
 # 1 = enabled
 #ieee80211ax=1
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 023c141..f0c01c7 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -960,8 +960,9 @@  static int hostapd_setup_bss(struct hostapd_data
*hapd, int first)
  os_memcpy(hapd->own_addr, if_addr, ETH_ALEN);
  }

- if (!conf->wmm_enabled && (hapd->iconf->ieee80211n ||
hapd->iconf->ieee80211ac)) {
- wpa_printf(MSG_ERROR, "HT/VHT is enabled so WMM cannot be disabled");
+ if (!conf->wmm_enabled && (hapd->iconf->ieee80211n ||
+ hapd->iconf->ieee80211ac || hapd->iconf->ieee80211ax)) {
+ wpa_printf(MSG_ERROR, "HT/VHT/HE is enabled so WMM cannot be disabled");
  return -1;