From c86a92a7f403228af3b1938be532c29ebe431c14 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 17 Jul 2009 16:55:42 +0200 Subject: [PATCH] Ensure to disconnect from devices and networks --- src/device.c | 4 +--- src/service.c | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/device.c b/src/device.c index 248c041..6c64683 100644 --- a/src/device.c +++ b/src/device.c @@ -1443,9 +1443,7 @@ int __connman_device_disconnect(struct connman_device *device) while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) { struct connman_network *network = value; - if (connman_network_get_connected(network) == TRUE || - connman_network_get_associating(network) == TRUE) - __connman_network_disconnect(network); + __connman_network_disconnect(network); } if (device->driver && device->driver->disconnect) diff --git a/src/service.c b/src/service.c index 014ec9e..497b027 100644 --- a/src/service.c +++ b/src/service.c @@ -1319,6 +1319,8 @@ done: goto failed; } + __connman_device_disconnect(device); + if (passphrase != NULL) { g_free(service->passphrase); service->passphrase = g_strdup(passphrase); -- 2.7.4