From: Matthew Wang Date: Fri, 2 Jun 2023 22:15:09 +0000 (-0700) Subject: nl80211: Fix uses_6ghz flag X-Git-Tag: hostap_2_11~891 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41baf0159a7d5bcd16cb70d625fcb4beafbc4fe8;p=thirdparty%2Fhostap.git nl80211: Fix uses_6ghz flag Presence of any 6ghz channels indicates nl80211 driver 6 GHz support, not non-DISABLED channels. This increases the timeout for scan completion for cases where 6 GHz might get scanned even if all the channel there are currently DISABLED. Signed-off-by: Matthew Wang --- diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c index 8ec01c866..1658da697 100644 --- a/src/drivers/driver_nl80211_capa.c +++ b/src/drivers/driver_nl80211_capa.c @@ -2560,8 +2560,7 @@ static void nl80211_dump_chan_list(struct wpa_driver_nl80211_data *drv, for (j = 0; j < mode->num_channels; j++) { struct hostapd_channel_data *chan = &mode->channels[j]; - if (chan->freq >= 5925 && chan->freq <= 7125 && - !(chan->flag & HOSTAPD_CHAN_DISABLED)) + if (is_6ghz_freq(chan->freq)) drv->uses_6ghz = true; res = os_snprintf(pos, end - pos, " %d%s%s%s", chan->freq,