From c47db2635fb2621f040c9639ed3de64b23228dd1 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Fri, 14 Sep 2018 21:17:57 -0500 Subject: [PATCH] device: Remove Disconnect method --- src/device.c | 15 --------------- src/station.c | 2 +- src/station.h | 3 --- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/device.c b/src/device.c index 8ac0336a..7cab2c13 100644 --- a/src/device.c +++ b/src/device.c @@ -89,19 +89,6 @@ static struct l_dbus_message *device_scan(struct l_dbus *dbus, return station_dbus_scan(dbus, message, station); } -static struct l_dbus_message *device_dbus_disconnect(struct l_dbus *dbus, - struct l_dbus_message *message, - void *user_data) -{ - struct device *device = user_data; - struct station *station = device->station; - - if (!device->powered || !device->station) - return dbus_error_not_available(message); - - return station_dbus_disconnect(dbus, message, station); -} - static struct l_dbus_message *device_get_networks(struct l_dbus *dbus, struct l_dbus_message *message, void *user_data) @@ -451,8 +438,6 @@ static void setup_device_interface(struct l_dbus_interface *interface) { l_dbus_interface_method(interface, "Scan", 0, device_scan, "", ""); - l_dbus_interface_method(interface, "Disconnect", 0, - device_dbus_disconnect, "", ""); l_dbus_interface_method(interface, "GetOrderedNetworks", 0, device_get_networks, "a(osns)", "", "networks"); diff --git a/src/station.c b/src/station.c index 854e71d0..07344e9a 100644 --- a/src/station.c +++ b/src/station.c @@ -1815,7 +1815,7 @@ int station_disconnect(struct station *station) return 0; } -struct l_dbus_message *station_dbus_disconnect(struct l_dbus *dbus, +static struct l_dbus_message *station_dbus_disconnect(struct l_dbus *dbus, struct l_dbus_message *message, void *user_data) { diff --git a/src/station.h b/src/station.h index 679035ee..6fc3a9ba 100644 --- a/src/station.h +++ b/src/station.h @@ -99,9 +99,6 @@ void station_ap_directed_roam(struct station *station, const struct mmpdu_header *hdr, const void *body, size_t body_len); -struct l_dbus_message *station_dbus_disconnect(struct l_dbus *dbus, - struct l_dbus_message *message, - void *user_data); struct l_dbus_message *station_build_get_networks_reply( struct station *station, struct l_dbus_message *message,