diff --git a/src/device.c b/src/device.c index cbd30dea..806790f0 100644 --- a/src/device.c +++ b/src/device.c @@ -158,12 +158,6 @@ static void periodic_scan_stop(struct device *device) } } -struct network *device_network_find(struct device *device, const char *ssid, - enum security security) -{ - return station_network_find(device->station, ssid, security); -} - static void device_enter_state(struct device *device, enum station_state state) { struct station *station = device->station; @@ -993,6 +987,7 @@ static bool device_hidden_network_scan_results(uint32_t wiphy_id, void *userdata) { struct device *device = userdata; + struct station *station = device->station; struct network *network_psk; struct network *network_open; struct network *network; @@ -1035,8 +1030,8 @@ next: l_queue_destroy(bss_list, NULL); - network_psk = device_network_find(device, ssid, SECURITY_PSK); - network_open = device_network_find(device, ssid, SECURITY_NONE); + network_psk = station_network_find(station, ssid, SECURITY_PSK); + network_open = station_network_find(station, ssid, SECURITY_NONE); if (!network_psk && !network_open) { dbus_pending_reply(&msg, dbus_error_not_found(msg)); @@ -1061,6 +1056,7 @@ static struct l_dbus_message *device_connect_hidden_network(struct l_dbus *dbus, void *user_data) { struct device *device = user_data; + struct station *station = device->station; const char *ssid; struct scan_parameters params = { .flush = true, @@ -1085,8 +1081,8 @@ static struct l_dbus_message *device_connect_hidden_network(struct l_dbus *dbus, known_networks_find(ssid, SECURITY_NONE)) return dbus_error_already_provisioned(message); - if (device_network_find(device, ssid, SECURITY_PSK) || - device_network_find(device, ssid, SECURITY_NONE)) + if (station_network_find(station, ssid, SECURITY_PSK) || + station_network_find(station, ssid, SECURITY_NONE)) return dbus_error_not_hidden(message); params.ssid = ssid; diff --git a/src/device.h b/src/device.h index 1dbdb0bf..8d5e03b9 100644 --- a/src/device.h +++ b/src/device.h @@ -22,7 +22,6 @@ #include -enum security; struct scan_bss; struct wiphy; struct netdev; @@ -35,8 +34,6 @@ void device_disassociated(struct device *device); void device_transition_start(struct device *device, struct scan_bss *bss); void device_set_scan_results(struct device *device, struct l_queue *bss_list, bool add_to_autoconnect); -struct network *device_network_find(struct device *device, const char *ssid, - enum security security); bool device_set_autoconnect(struct device *device, bool autoconnect); int __device_connect_network(struct device *device, struct network *network, diff --git a/src/wsc.c b/src/wsc.c index 7efe5f7e..39d324f3 100644 --- a/src/wsc.c +++ b/src/wsc.c @@ -120,7 +120,7 @@ static void wsc_try_credentials(struct wsc *wsc) struct scan_bss *bss; for (i = 0; i < wsc->n_creds; i++) { - network = device_network_find(device, + network = station_network_find(wsc->station, wsc->creds[i].ssid, wsc->creds[i].security); if (!network)