mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2024-11-29 13:59:24 +01:00
scan: Check if an external scan flushed intermediate results
When handling a scan finished event for a scan we haven't started check that we were not halfway through a scan request that would have its results flushed by the external scan.
This commit is contained in:
parent
d256bc91ad
commit
157d5f9f47
26
src/scan.c
26
src/scan.c
@ -99,6 +99,8 @@ struct scan_context {
|
|||||||
* is running.
|
* is running.
|
||||||
*/
|
*/
|
||||||
bool triggered:1;
|
bool triggered:1;
|
||||||
|
/* Whether any commands from current request's queue have started */
|
||||||
|
bool started:1;
|
||||||
struct wiphy *wiphy;
|
struct wiphy *wiphy;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -265,6 +267,7 @@ static void scan_request_triggered(struct l_genl_msg *msg, void *userdata)
|
|||||||
sr->passive ? "Passive" : "Active", sc->ifindex);
|
sr->passive ? "Passive" : "Active", sc->ifindex);
|
||||||
|
|
||||||
sc->triggered = true;
|
sc->triggered = true;
|
||||||
|
sc->started = true;
|
||||||
l_genl_msg_unref(l_queue_pop_head(sr->cmds));
|
l_genl_msg_unref(l_queue_pop_head(sr->cmds));
|
||||||
|
|
||||||
if (sr->trigger) {
|
if (sr->trigger) {
|
||||||
@ -573,6 +576,7 @@ bool scan_cancel(uint32_t ifindex, uint32_t id)
|
|||||||
sc->start_cmd_id = 0;
|
sc->start_cmd_id = 0;
|
||||||
sc->get_scan_cmd_id = 0;
|
sc->get_scan_cmd_id = 0;
|
||||||
l_queue_remove(sc->requests, sr);
|
l_queue_remove(sc->requests, sr);
|
||||||
|
sc->started = false;
|
||||||
start_next_scan_request(sc);
|
start_next_scan_request(sc);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1167,6 +1171,7 @@ static void scan_finished(struct scan_context *sc, uint32_t wiphy,
|
|||||||
|
|
||||||
if (sr) {
|
if (sr) {
|
||||||
l_queue_remove(sc->requests, sr);
|
l_queue_remove(sc->requests, sr);
|
||||||
|
sc->started = false;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Can start a new scan now that we've removed this one from
|
* Can start a new scan now that we've removed this one from
|
||||||
@ -1211,6 +1216,22 @@ static void get_scan_done(void *user)
|
|||||||
l_free(results);
|
l_free(results);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool scan_parse_flush_flag_from_msg(struct l_genl_msg *msg)
|
||||||
|
{
|
||||||
|
struct l_genl_attr attr;
|
||||||
|
uint16_t type, len;
|
||||||
|
const void *data;
|
||||||
|
|
||||||
|
if (!l_genl_attr_init(&attr, msg))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
while (l_genl_attr_next(&attr, &type, &len, &data))
|
||||||
|
if (type == NL80211_SCAN_FLAG_FLUSH)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
static void scan_parse_new_scan_results(struct l_genl_msg *msg,
|
static void scan_parse_new_scan_results(struct l_genl_msg *msg,
|
||||||
struct scan_results *results)
|
struct scan_results *results)
|
||||||
{
|
{
|
||||||
@ -1337,7 +1358,10 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
|
|||||||
if (sc->sp.callback)
|
if (sc->sp.callback)
|
||||||
get_results = true;
|
get_results = true;
|
||||||
|
|
||||||
if (sr && !sc->start_cmd_id)
|
/* An external scan may have flushed our results */
|
||||||
|
if (sc->started && scan_parse_flush_flag_from_msg(msg))
|
||||||
|
scan_finished(sc, attr_wiphy, -EAGAIN, NULL, sr);
|
||||||
|
else if (sr && !sc->start_cmd_id)
|
||||||
send_next = true;
|
send_next = true;
|
||||||
|
|
||||||
sr = NULL;
|
sr = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user