Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

scan: Move 'started' to scan_request 

This makes it a little easier to book-keep the started variable.  Since
scan_request already has a 'passive' bit-field, there should be no
storage penalty.
This commit is contained in:
Denis Kenzior 2022-01-18 15:10:07 -06:00
parent af375a1cde
commit c4c86ea1df
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/scan.c
View File

@ -81,6 +81,7 @@ struct scan_request {
scan_destroy_func_t destroy; scan_destroy_func_t destroy;
bool canceled : 1; /* Is scan_cancel being called on this request? */ bool canceled : 1; /* Is scan_cancel being called on this request? */
bool passive:1; /* Active or Passive scan? */ bool passive:1; /* Active or Passive scan? */
bool started : 1; /* Has TRIGGER_SCAN succeeded at least once? */
struct l_queue *cmds; struct l_queue *cmds;
/* The time the current scan was started. Reported in TRIGGER_SCAN */ /* The time the current scan was started. Reported in TRIGGER_SCAN */
uint64_t start_time_tsf; uint64_t start_time_tsf;
@ -115,8 +116,6 @@ 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;
}; };
@ -250,7 +249,7 @@ static void scan_request_triggered(struct l_genl_msg *msg, void *userdata)
sr->passive ? "Passive" : "Active", sc->wdev_id); sr->passive ? "Passive" : "Active", sc->wdev_id);
sc->triggered = true; sc->triggered = true;
sc->started = true; sr->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) {
@ -845,7 +844,6 @@ bool scan_cancel(uint64_t wdev_id, uint32_t id)
sc->start_cmd_id = 0; sc->start_cmd_id = 0;
l_queue_remove(sc->requests, sr); l_queue_remove(sc->requests, sr);
sc->started = false;
} else } else
l_queue_remove(sc->requests, sr); l_queue_remove(sc->requests, sr);
@ -1707,7 +1705,6 @@ static void scan_finished(struct scan_context *sc,
if (sr) { if (sr) {
l_queue_remove(sc->requests, sr); l_queue_remove(sc->requests, sr);
sc->started = false;
if (sr->callback) if (sr->callback)
new_owner = sr->callback(err, bss_list, new_owner = sr->callback(err, bss_list,
@ -1883,7 +1880,8 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
* our results. Otherwise, try to retry the trigger * our results. Otherwise, try to retry the trigger
* request if it failed with an -EBUSY. * request if it failed with an -EBUSY.
*/ */
if (sc->started && scan_parse_flush_flag_from_msg(msg)) if (sr && sr->started &&
scan_parse_flush_flag_from_msg(msg))
scan_finished(sc, -EAGAIN, NULL, NULL, sr); scan_finished(sc, -EAGAIN, NULL, NULL, sr);
else else
retry = true; retry = true;