From: Jouni Malinen Date: Sat, 13 Feb 2021 22:31:04 +0000 (+0200) Subject: Do not include VHT elements in Beacon frames on the 6 GHz band X-Git-Tag: hostap_2_10~580 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eb5f7128e3e9b08011b35aebf6f92cc07f87483;p=thirdparty%2Fhostap.git Do not include VHT elements in Beacon frames on the 6 GHz band A similar change was previously done for Probe Response frames, but the Beacon frame case was missed. Fix this to remove the VHT elements also from Beacon frames on the 6 GHz since the relevant information is included only in the HE elements on that band. Fixes: 49e95ee1ee2c ("AP: Publish only HE capabilities and operation IEs on 6 GHz band") Signed-off-by: Jouni Malinen --- diff --git a/src/ap/beacon.c b/src/ap/beacon.c index 5005e9c9d..fbbe8f4db 100644 --- a/src/ap/beacon.c +++ b/src/ap/beacon.c @@ -1290,7 +1290,8 @@ int ieee802_11_build_ap_params(struct hostapd_data *hapd, #endif /* CONFIG_FST */ #ifdef CONFIG_IEEE80211AC - if (hapd->iconf->ieee80211ac && !hapd->conf->disable_11ac) { + if (hapd->iconf->ieee80211ac && !hapd->conf->disable_11ac && + !is_6ghz_op_class(hapd->iconf->op_class)) { tailpos = hostapd_eid_vht_capabilities(hapd, tailpos, 0); tailpos = hostapd_eid_vht_operation(hapd, tailpos); tailpos = hostapd_eid_txpower_envelope(hapd, tailpos);