Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-01 22:34:07 +01:00
Code Releases Activity

device: Remove Scan method

Browse Source
This commit is contained in:
Denis Kenzior 2018-09-14 21:21:47 -05:00
parent 189a96e91a
commit b2e0a82225
3 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/device.c
View File

@ -72,23 +72,6 @@ static void device_ap_roam_frame_event(struct netdev *netdev,
station_ap_directed_roam(station, hdr, body, body_len); station_ap_directed_roam(station, hdr, body, body_len);
} }
static struct l_dbus_message *device_scan(struct l_dbus *dbus,
struct l_dbus_message *message,
void *user_data)
{
struct device *device = user_data;
struct station *station = device->station;
/* TODO: Remove when Device/Station split is done */
if (netdev_get_iftype(device->netdev) != NETDEV_IFTYPE_STATION)
return dbus_error_not_available(message);
if (!device->powered)
return dbus_error_failed(message);
return station_dbus_scan(dbus, message, station);
}
static struct l_dbus_message *device_get_networks(struct l_dbus *dbus, static struct l_dbus_message *device_get_networks(struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
void *user_data) void *user_data)
@ -436,8 +419,6 @@ static struct l_dbus_message *device_property_set_mode(struct l_dbus *dbus,
static void setup_device_interface(struct l_dbus_interface *interface) static void setup_device_interface(struct l_dbus_interface *interface)
{ {
l_dbus_interface_method(interface, "Scan", 0,
device_scan, "", "");
l_dbus_interface_method(interface, "GetOrderedNetworks", 0, l_dbus_interface_method(interface, "GetOrderedNetworks", 0,
device_get_networks, "a(osns)", "", device_get_networks, "a(osns)", "",
"networks"); "networks");

2
src/station.c
View File

@ -1931,7 +1931,7 @@ static void station_dbus_scan_triggered(int err, void *user_data)
IWD_DEVICE_INTERFACE, "Scanning"); IWD_DEVICE_INTERFACE, "Scanning");
} }
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)
{ {

3
src/station.h
View File

@ -103,9 +103,6 @@ struct l_dbus_message *station_build_get_networks_reply(
struct station *station, struct station *station,
struct l_dbus_message *message, struct l_dbus_message *message,
bool legacy); bool legacy);
struct l_dbus_message *station_dbus_scan(struct l_dbus *dbus,
struct l_dbus_message *message,
void *user_data);
int __station_connect_network(struct station *station, struct network *network, int __station_connect_network(struct station *station, struct network *network,
struct scan_bss *bss); struct scan_bss *bss);