Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-26 10:39:23 +01:00
Code Releases Activity

station: Refactor station_scan_destroy closer to its usage

Browse Source 
The function is also renamed to reflect its usage
This commit is contained in:
Tim Kourt 2019-03-22 14:17:41 -07:00 committed by Denis Kenzior
parent e4a5972b42
commit 395d8b9ea0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/station.c
View File

@ -640,13 +640,6 @@ static void periodic_scan_stop(struct station *station)
} }
} }
static void station_scan_destroy(void *userdata)
{
struct station *station = userdata;
station->scan_id = 0;
}
static bool station_needs_hidden_network_scan(struct station *station) static bool station_needs_hidden_network_scan(struct station *station)
{ {
return !l_queue_isempty(station->hidden_bss_list_sorted) && return !l_queue_isempty(station->hidden_bss_list_sorted) &&
@ -2174,6 +2167,13 @@ static void station_dbus_scan_triggered(int err, void *user_data)
IWD_STATION_INTERFACE, "Scanning"); IWD_STATION_INTERFACE, "Scanning");
} }
static void station_dbus_scan_destroy(void *userdata)
{
struct station *station = userdata;
station->scan_id = 0;
}
static struct l_dbus_message *station_dbus_scan(struct l_dbus *dbus, static struct l_dbus_message *station_dbus_scan(struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
void *user_data) void *user_data)
@ -2188,7 +2188,7 @@ static struct l_dbus_message *station_dbus_scan(struct l_dbus *dbus,
station->scan_id = station_scan_trigger(station, NULL, station->scan_id = station_scan_trigger(station, NULL,
station_dbus_scan_triggered, station_dbus_scan_triggered,
new_scan_results, new_scan_results,
station_scan_destroy); station_dbus_scan_destroy);
if (!station->scan_id) if (!station->scan_id)
return dbus_error_failed(message); return dbus_error_failed(message);