From ea93e74a0650f5f0355919184c265ae747e52a37 Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Mon, 12 Dec 2022 14:08:57 -0800 Subject: [PATCH] scan: remove early supported check for 6ghz in wiphy watch If the regdom updates during a periodic scan the results will be delayed until after the update in order to, potentially, add 6GHz frequencies since they may become available. The delayed results happen regardless of 6GHz support but scan_wiphy_watch() was returning early if 6GHz was not supported causing the scan request to never complete. --- src/scan.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/scan.c b/src/scan.c index dbc46a75..48e53e9a 100644 --- a/src/scan.c +++ b/src/scan.c @@ -1925,12 +1925,9 @@ static void scan_wiphy_watch(struct wiphy *wiphy, struct scan_freq_set *freqs_6ghz; struct scan_freq_set *allowed; bool allow_6g; - const struct scan_freq_set *supported = - wiphy_get_supported_freqs(wiphy); - /* Only care about regulatory events, and if 6GHz capable */ - if (event != WIPHY_STATE_WATCH_EVENT_REGDOM_DONE || - !(scan_freq_set_get_bands(supported) & BAND_FREQ_6_GHZ)) + /* Only care about completed regulatory dumps */ + if (event != WIPHY_STATE_WATCH_EVENT_REGDOM_DONE) return; if (!sc->sp.id)