Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-03 10:32:33 +01:00
Code Releases Activity

scan: Drop the wiphy_id scan callback parameter

Browse Source
This commit is contained in:
Andrew Zaborowski 2018-12-04 03:44:35 +01:00 committed by Denis Kenzior
parent e4858d6da3
commit b375191c61
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/scan.c
View File

@ -139,7 +139,7 @@ static void scan_request_failed(struct scan_context *sc,
if (sr->trigger) if (sr->trigger)
sr->trigger(err, sr->userdata); sr->trigger(err, sr->userdata);
else if (sr->callback) else if (sr->callback)
sr->callback(0, sc->ifindex, err, NULL, sr->userdata); sr->callback(sc->ifindex, err, NULL, sr->userdata);
scan_request_free(sr); scan_request_free(sr);
} }
@ -1172,8 +1172,7 @@ static void scan_finished(struct scan_context *sc, uint32_t wiphy,
} }
if (callback) if (callback)
new_owner = callback(wiphy, sc->ifindex, err, new_owner = callback(sc->ifindex, err, bss_list, userdata);
bss_list, userdata);
if (sr) if (sr)
scan_request_free(sr); scan_request_free(sr);

2
src/scan.h
View File

@ -33,7 +33,7 @@ enum scan_state {
typedef void (*scan_func_t)(struct l_genl_msg *msg, void *user_data); typedef void (*scan_func_t)(struct l_genl_msg *msg, void *user_data);
typedef void (*scan_trigger_func_t)(int, void *); typedef void (*scan_trigger_func_t)(int, void *);
typedef bool (*scan_notify_func_t)(uint32_t wiphy, uint32_t ifindex, int err, typedef bool (*scan_notify_func_t)(uint32_t ifindex, int err,
struct l_queue *bss_list, struct l_queue *bss_list,
void *userdata); void *userdata);
typedef void (*scan_destroy_func_t)(void *userdata); typedef void (*scan_destroy_func_t)(void *userdata);

9
src/station.c
View File

@ -564,7 +564,7 @@ not_supported:
return NULL; return NULL;
} }
static bool new_scan_results(uint32_t wiphy_id, uint32_t ifindex, int err, static bool new_scan_results(uint32_t ifindex, int err,
struct l_queue *bss_list, void *userdata) struct l_queue *bss_list, void *userdata)
{ {
struct station *station = userdata; struct station *station = userdata;
@ -1041,8 +1041,8 @@ static void station_roam_scan_triggered(int err, void *user_data)
*/ */
} }
static bool station_roam_scan_notify(uint32_t wiphy_id, uint32_t ifindex, static bool station_roam_scan_notify(uint32_t ifindex, int err,
int err, struct l_queue *bss_list, struct l_queue *bss_list,
void *userdata) void *userdata)
{ {
struct station *station = userdata; struct station *station = userdata;
@ -1678,8 +1678,7 @@ static void station_hidden_network_scan_triggered(int err, void *user_data)
dbus_error_failed(station->connect_pending)); dbus_error_failed(station->connect_pending));
} }
static bool station_hidden_network_scan_results(uint32_t wiphy_id, static bool station_hidden_network_scan_results(uint32_t ifindex, int err,
uint32_t ifindex, int err,
struct l_queue *bss_list, struct l_queue *bss_list,
void *userdata) void *userdata)
{ {

6
src/wsc.c
View File

@ -560,8 +560,8 @@ static void pin_timeout(struct l_timeout *timeout, void *user_data)
wsc_error_time_expired(wsc->pending)); wsc_error_time_expired(wsc->pending));
} }
static bool push_button_scan_results(uint32_t wiphy_id, uint32_t ifindex, static bool push_button_scan_results(uint32_t ifindex, int err,
int err, struct l_queue *bss_list, struct l_queue *bss_list,
void *userdata) void *userdata)
{ {
struct wsc *wsc = userdata; struct wsc *wsc = userdata;
@ -718,7 +718,7 @@ static bool authorized_macs_contains(const uint8_t *authorized_macs,
return false; return false;
} }
static bool pin_scan_results(uint32_t wiphy_id, uint32_t ifindex, int err, static bool pin_scan_results(uint32_t ifindex, int err,
struct l_queue *bss_list, void *userdata) struct l_queue *bss_list, void *userdata)
{ {
static const uint8_t wildcard_address[] = static const uint8_t wildcard_address[] =