From: James Prestwood <prestwoj@gmail.com>
To: iwd@lists.linux.dev
Cc: James Prestwood <prestwoj@gmail.com>
Subject: [PATCH v2 1/4] scan: allow splitting of scans with defined frequencies
Date: Thu, 28 Sep 2023 05:41:25 -0700 [thread overview]
Message-ID: <20230928124128.3793788-1-prestwoj@gmail.com> (raw)
Currently the only way a scan can be split is if the request does
not specify any frequencies, implying the request should scan the
entire spectrum. This allows the scan logic to issue an extra
request if 6GHz becomes available during the 2.4 or 5GHz scans.
This restriction was somewhat arbitrary and done to let periodic
scans pick up 6GHz APs through a single scan request.
But now with the addition of allowing user-disabled bands
periodic scans will need to specify a frequency list in case a
given band has been disabled. This will break the scan splitting
code which is why this prep work is being done.
The main difference now is the original scan frequencies are
tracked with the scan request. The reason for this is so if a
request comes in with a limited set of 6GHz frequences IWD won't
end up scanning the full 6GHz spectrum later on.
---
src/scan.c | 56 +++++++++++++++++++++---------------------------------
1 file changed, 22 insertions(+), 34 deletions(-)
v2:
* Use _auto_ for allowed frequencies in scan_cmds_add()
diff --git a/src/scan.c b/src/scan.c
index 915e2875..e6c105c0 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -107,6 +107,8 @@ struct scan_request {
* and save these since there may be additional scan commands to run.
*/
struct scan_freq_set *freqs_scanned;
+ /* Entire list of frequencies to scan */
+ struct scan_freq_set *scan_freqs;
};
struct scan_context {
@@ -170,6 +172,7 @@ static void scan_request_free(struct wiphy_radio_work_item *item)
l_queue_destroy(sr->cmds, (l_queue_destroy_func_t) l_genl_msg_unref);
scan_freq_set_free(sr->freqs_scanned);
+ scan_freq_set_free(sr->scan_freqs);
l_free(sr);
}
@@ -341,20 +344,6 @@ static bool scan_mac_address_randomization_is_disabled(void)
return disabled;
}
-static struct scan_freq_set *scan_get_allowed_freqs(struct scan_context *sc)
-{
- struct scan_freq_set *allowed = scan_freq_set_new();
-
- scan_freq_set_merge(allowed, wiphy_get_supported_freqs(sc->wiphy));
-
- if (!wiphy_constrain_freq_set(sc->wiphy, allowed)) {
- scan_freq_set_free(allowed);
- allowed = NULL;
- }
-
- return allowed;
-}
-
static struct l_genl_msg *scan_build_cmd(struct scan_context *sc,
bool ignore_flush_flag, bool is_passive,
const struct scan_parameters *params,
@@ -582,22 +571,28 @@ static void scan_cmds_add(struct scan_request *sr, struct scan_context *sc,
bool passive,
const struct scan_parameters *params)
{
+ uint32_t bands = BAND_FREQ_2_4_GHZ | BAND_FREQ_5_GHZ | BAND_FREQ_6_GHZ;
unsigned int i;
struct scan_freq_set *subsets[2] = { 0 };
- struct scan_freq_set *allowed = scan_get_allowed_freqs(sc);
+ _auto_(scan_freq_set_free) struct scan_freq_set *allowed =
+ wiphy_get_allowed_freqs(sc->wiphy, bands);
const struct scan_freq_set *supported =
wiphy_get_supported_freqs(sc->wiphy);
/*
- * If 6GHz is not possible, or already allowed, or the frequencies are
- * explicit don't break up the request.
+ * No frequencies, just include the entire supported list and let the
+ * kernel filter out any disabled frequencies
*/
+ if (!params->freqs)
+ sr->scan_freqs = scan_freq_set_clone(supported, bands);
+ else
+ sr->scan_freqs = scan_freq_set_clone(params->freqs, bands);
+
+ /* If 6GHz is not possible or already allowed don't split the request */
if (!(scan_freq_set_get_bands(supported) & BAND_FREQ_6_GHZ) ||
- (scan_freq_set_get_bands(allowed) & BAND_FREQ_6_GHZ) ||
- params->freqs) {
- scan_freq_set_free(allowed);
+ (scan_freq_set_get_bands(allowed) & BAND_FREQ_6_GHZ)) {
scan_build_next_cmd(sr->cmds, sc, passive,
- params, params->freqs);
+ params, sr->scan_freqs);
return;
}
@@ -613,10 +608,8 @@ static void scan_cmds_add(struct scan_request *sr, struct scan_context *sc,
* extra 6GHz-only passive scan can be appended to this request
* at that time.
*/
- subsets[0] = scan_freq_set_clone(allowed, BAND_FREQ_2_4_GHZ);
- subsets[1] = scan_freq_set_clone(allowed, BAND_FREQ_5_GHZ);
-
- scan_freq_set_free(allowed);
+ subsets[0] = scan_freq_set_clone(sr->scan_freqs, BAND_FREQ_2_4_GHZ);
+ subsets[1] = scan_freq_set_clone(sr->scan_freqs, BAND_FREQ_5_GHZ);
for(i = 0; i < L_ARRAY_SIZE(subsets); i++) {
if (!scan_freq_set_isempty(subsets[i]))
@@ -1918,9 +1911,8 @@ static void scan_wiphy_watch(struct wiphy *wiphy,
struct scan_request *sr = NULL;
struct l_genl_msg *msg = NULL;
struct scan_parameters params = { 0 };
- struct scan_freq_set *freqs_6ghz;
struct scan_freq_set *allowed;
- bool allow_6g;
+ _auto_(scan_freq_set_free) struct scan_freq_set *freqs_6ghz = NULL;
/* Only care about completed regulatory dumps */
if (event != WIPHY_STATE_WATCH_EVENT_REGDOM_DONE)
@@ -1934,14 +1926,14 @@ static void scan_wiphy_watch(struct wiphy *wiphy,
if (!sr)
return;
- allowed = scan_get_allowed_freqs(sc);
- allow_6g = scan_freq_set_get_bands(allowed) & BAND_FREQ_6_GHZ;
+ allowed = wiphy_get_allowed_freqs(sc->wiphy, BAND_FREQ_6_GHZ);
+ freqs_6ghz = scan_freq_set_clone(sr->scan_freqs, BAND_FREQ_6_GHZ);
/*
* This update did not allow 6GHz, or the original request was
* not expecting 6GHz. The periodic scan should now be ended.
*/
- if (!allow_6g || !sr->split) {
+ if (!allowed || scan_freq_set_isempty(freqs_6ghz) || !sr->split) {
scan_get_results(sc, sr, sr->freqs_scanned);
goto free_allowed;
}
@@ -1951,13 +1943,9 @@ static void scan_wiphy_watch(struct wiphy *wiphy,
* Create a new 6GHz passive scan request and append to the
* command list
*/
- freqs_6ghz = scan_freq_set_clone(allowed, BAND_FREQ_6_GHZ);
-
msg = scan_build_cmd(sc, false, true, ¶ms, freqs_6ghz);
l_queue_push_tail(sr->cmds, msg);
- scan_freq_set_free(freqs_6ghz);
-
/*
* If this periodic scan is at the top of the queue, continue
* running it.
--
2.25.1
next reply other threads:[~2023-09-28 12:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-28 12:41 James Prestwood [this message]
2023-09-28 12:41 ` [PATCH v2 2/4] scan: filter user-disabled bands for periodic scans James Prestwood
2023-09-29 15:27 ` Denis Kenzior
2023-09-28 12:41 ` [PATCH v2 3/4] station: support user-disabled bands James Prestwood
2023-09-29 15:37 ` Denis Kenzior
2023-09-29 16:23 ` James Prestwood
2023-09-28 12:41 ` [PATCH v2 4/4] doc: document disabling bands with a 0.0 modifier James Prestwood
2023-09-29 15:26 ` [PATCH v2 1/4] scan: allow splitting of scans with defined frequencies Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230928124128.3793788-1-prestwoj@gmail.com \
--to=prestwoj@gmail.com \
--cc=iwd@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).