From 68a79b23fb0a68cfedde7c28341abf37e08ab95f Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Mon, 16 May 2016 12:24:41 -0500 Subject: [PATCH] device: Add device_is_busy() --- src/device.h | 1 + src/wiphy.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/device.h b/src/device.h index d3e42c67..7ff51119 100644 --- a/src/device.h +++ b/src/device.h @@ -38,6 +38,7 @@ void __device_watch_call_removed(struct netdev *device); struct network *device_get_connected_network(struct netdev *device); const char *device_get_path(struct netdev *device); +bool device_is_busy(struct netdev *device); void device_connect_network(struct netdev *device, struct network *network, struct scan_bss *bss, diff --git a/src/wiphy.c b/src/wiphy.c index 68213525..e5e6919e 100644 --- a/src/wiphy.c +++ b/src/wiphy.c @@ -184,6 +184,15 @@ struct network *device_get_connected_network(struct netdev *device) return device->connected_network; } +bool device_is_busy(struct netdev *device) +{ + if (device->state != DEVICE_STATE_DISCONNECTED && + device->state != DEVICE_STATE_AUTOCONNECT) + return true; + + return false; +} + static void netdev_enter_state(struct netdev *netdev, enum device_state state) { l_debug("Old State: %s, new state: %s", @@ -444,8 +453,7 @@ static struct l_dbus_message *network_connect(struct l_dbus *dbus, l_debug(""); - if (netdev->state != DEVICE_STATE_DISCONNECTED && - netdev->state != DEVICE_STATE_AUTOCONNECT) + if (device_is_busy(netdev)) return dbus_error_busy(message); /*