Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

station: Remove unneeded logic from dbus_scan_done

Browse Source 
Commit eac2410c83 ("station: Take scanned frequencies into account")
has made it unnecessary to explicitly invoke station_set_scan_results
with the expire to true in case a dbus scan finished prematurely or a
subset was not able to be started.  Remove this no-longer needed logic.

Fixes: eac2410c83 ("station: Take scanned frequencies into account")
This commit is contained in:
Denis Kenzior 2021-02-03 14:37:01 -06:00
parent 5370fefdad
commit 0c277e442e
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/station.c
View File

@ -2989,21 +2989,9 @@ static struct l_dbus_message *station_dbus_get_hidden_access_points(
return reply; return reply;
} }
static void station_dbus_scan_done(struct station *station, bool expired) static void station_dbus_scan_done(struct station *station)
{ {
station->dbus_scan_id = 0; station->dbus_scan_id = 0;
if (!expired) {
/*
* We haven't dropped old BSS records from bss_list during
* this scan yet so do it now. Call station_set_scan_results
* with an empty new BSS list to do this. Not the cheapest
* but this should only happen when station_dbus_scan_done is
* called early, i.e. due to an error.
*/
station_set_scan_results(station, l_queue_new(), false, true);
}
station_property_set_scanning(station, false); station_property_set_scanning(station, false);
} }
@ -3021,7 +3009,7 @@ static void station_dbus_scan_triggered(int err, void *user_data)
dbus_pending_reply(&station->scan_pending, reply); dbus_pending_reply(&station->scan_pending, reply);
} }
station_dbus_scan_done(station, false); station_dbus_scan_done(station);
return; return;
} }
@ -3050,7 +3038,7 @@ static bool station_dbus_scan_results(int err, struct l_queue *bss_list,
bool last_subset; bool last_subset;
if (err) { if (err) {
station_dbus_scan_done(station, false); station_dbus_scan_done(station);
return false; return false;
} }
@ -3062,7 +3050,7 @@ static bool station_dbus_scan_results(int err, struct l_queue *bss_list,
station->dbus_scan_subset_idx = next_idx; station->dbus_scan_subset_idx = next_idx;
if (last_subset || !station_dbus_scan_subset(station)) if (last_subset || !station_dbus_scan_subset(station))
station_dbus_scan_done(station, last_subset); station_dbus_scan_done(station);
return true; return true;
} }