DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

nl80211: Increase the hard scan timeout for initial attempt

Browse source 
If both 6 GHz and S1G channels are included, the previously used timeout
was not long enough at least with mac80211_hwsim. Increase the initial
timeout to allow such a scan to be completed.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2024-01-26 12:26:36 +02:00 committed by Jouni Malinen
parent e619dcce31
commit 16a22ef340
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/drivers/driver_nl80211.h
View file

@ -197,6 +197,7 @@ struct wpa_driver_nl80211_data {
unsigned int qca_do_acs:1;
unsigned int brcm_do_acs:1;
unsigned int uses_6ghz:1;
unsigned int uses_s1g:1;
unsigned int secure_ranging_ctx_vendor_cmd_avail:1;
unsigned int puncturing:1;
unsigned int qca_ap_allowed_freqs:1;

2
src/drivers/driver_nl80211_capa.c
View file

@ -2579,6 +2579,8 @@ static void nl80211_dump_chan_list(struct wpa_driver_nl80211_data *drv,
if (is_6ghz_freq(chan->freq))
drv->uses_6ghz = true;
if (chan->freq >= 900 && chan->freq < 1000)
drv->uses_s1g = true;
res = os_snprintf(pos, end - pos, " %d%s%s%s",
chan->freq,
(chan->flag & HOSTAPD_CHAN_DISABLED) ?

4
src/drivers/driver_nl80211_scan.c
View file

@ -427,7 +427,9 @@ int wpa_driver_nl80211_scan(struct i802_bss *bss,
drv->scan_state = SCAN_REQUESTED;
/* Not all drivers generate "scan completed" wireless event, so try to
* read results after a timeout. */
timeout = drv->uses_6ghz ? 15 : 10;
timeout = drv->uses_6ghz ? 20 : 10;
if (drv->uses_s1g)
timeout += 5;
if (drv->scan_complete_events) {
/*
* The driver seems to deliver events to notify when scan is