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

scan: Remove work_started variable 

With the introduction of wiphy_radio_work_is_running we no longer need
to track this separately.
This commit is contained in:
Denis Kenzior 2022-01-18 11:47:39 -06:00
parent b20774a55f
commit 44a7bc640b
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/scan.c
View File

@ -116,7 +116,6 @@ struct scan_context {
bool triggered:1; bool triggered:1;
/* Whether any commands from current request's queue have started */ /* Whether any commands from current request's queue have started */
bool started:1; bool started:1;
bool work_started:1;
struct wiphy *wiphy; struct wiphy *wiphy;
}; };
@ -843,7 +842,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; sc->started = false;
sc->work_started = false;
} else } else
l_queue_remove(sc->requests, sr); l_queue_remove(sc->requests, sr);
@ -1050,16 +1048,12 @@ static bool start_next_scan_request(struct wiphy_radio_work_item *item)
struct scan_request, work); struct scan_request, work);
struct scan_context *sc = sr->sc; struct scan_context *sc = sr->sc;
sc->work_started = true;
if (sc->state != SCAN_STATE_NOT_RUNNING) if (sc->state != SCAN_STATE_NOT_RUNNING)
return false; return false;
if (!scan_request_send_trigger(sc, sr)) if (!scan_request_send_trigger(sc, sr))
return false; return false;
sc->work_started = false;
scan_request_failed(sc, sr, -EIO); scan_request_failed(sc, sr, -EIO);
return true; return true;
@ -1710,7 +1704,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; sc->started = false;
sc->work_started = false;
if (sr->callback) if (sr->callback)
new_owner = sr->callback(err, bss_list, new_owner = sr->callback(err, bss_list,
@ -1847,6 +1840,7 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
struct l_genl_msg *scan_msg; struct l_genl_msg *scan_msg;
struct scan_results *results; struct scan_results *results;
bool send_next = false; bool send_next = false;
bool retry = false;
bool get_results = false; bool get_results = false;
if (sc->state == SCAN_STATE_NOT_RUNNING) if (sc->state == SCAN_STATE_NOT_RUNNING)
@ -1880,28 +1874,30 @@ 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;
/* An external scan may have flushed our results */ /*
* Drop the ongoing scan if an external scan flushed
* our results. Otherwise, try to retry the trigger
* request if it failed with an -EBUSY.
*/
if (sc->started && scan_parse_flush_flag_from_msg(msg)) if (sc->started && scan_parse_flush_flag_from_msg(msg))
scan_finished(sc, -EAGAIN, NULL, NULL, sr); scan_finished(sc, -EAGAIN, NULL, NULL, sr);
else else
send_next = true; retry = true;
sr = NULL; sr = NULL;
} }
/* /*
* Send the next command of an ongoing request, or continue with * Send the next command of an ongoing request, or continue
* a previously busy scan attempt due to an external scan. A * with a previously busy scan attempt due to an external
* temporary scan_request object is used (rather than 'sr') * scan.
* because the state of 'sr' tells us if the results should
* be used either as normal scan results, or to take advantage
* of the external scan as a 'free' periodic scan of sorts.
*/ */
if (sc->work_started && send_next) { if (send_next || retry) {
struct scan_request *next = l_queue_peek_head( struct scan_request *next = l_queue_peek_head(
sc->requests); sc->requests);
if (next) if (next && wiphy_radio_work_is_running(sc->wiphy,
next->work.id))
start_next_scan_request(&next->work); start_next_scan_request(&next->work);
} }
@ -1955,7 +1951,8 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data)
* hardware or the driver because of another activity * hardware or the driver because of another activity
* starting in which case we should just get an EBUSY. * starting in which case we should just get an EBUSY.
*/ */
if (sc->work_started) if (sr && wiphy_radio_work_is_running(sc->wiphy,
sr->work.id))
start_next_scan_request(&sr->work); start_next_scan_request(&sr->work);
} }