From ba6a48018c1f58b405826e5fad15d4bccf02a9d1 Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Mon, 10 Oct 2022 12:40:11 -0700 Subject: [PATCH] station: constrain known frequencies before roam scan The known frequency list may include frequencies that once were allowed but are now disabled due to regulatory restrictions. Don't include these frequencies in the roam scan. --- src/station.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/station.c b/src/station.c index b86a02a0..294edd61 100644 --- a/src/station.c +++ b/src/station.c @@ -2656,12 +2656,17 @@ static int station_roam_scan_known_freqs(struct station *station) station->connected_network); struct scan_freq_set *freqs = network_info_get_roam_frequencies(info, station->connected_bss->frequency, 5); - int r; + int r = -ENODATA; if (!freqs) - return -ENODATA; + return r; + + if (!wiphy_constrain_freq_set(station->wiphy, freqs)) + goto free_set; r = station_roam_scan(station, freqs); + +free_set: scan_freq_set_free(freqs); return r; }