summaryrefslogtreecommitdiff
path: root/src/device.c
diff options
context:
space:
mode:
authorDaniel Wagner <daniel.wagner@bmw-carit.de>2011-08-04 17:35:36 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2011-08-04 18:02:49 +0200
commit76359ac3fd89af2002afbf0cf1ebe0aa222bcff8 (patch)
tree65588714f83d6b5fbc3782eabc77db077e48a5aa /src/device.c
parent475d9ac770eae6d25b60fa2f2ab55e0698ac6dd0 (diff)
downloadconnman-76359ac3fd89af2002afbf0cf1ebe0aa222bcff8.tar.gz
connman-76359ac3fd89af2002afbf0cf1ebe0aa222bcff8.tar.bz2
connman-76359ac3fd89af2002afbf0cf1ebe0aa222bcff8.zip
service: Remove __connman_service_reset_from_networks()
This is not needed because there is only 1 network per service. Fixes BMC#22078
Diffstat (limited to 'src/device.c')
-rw-r--r--src/device.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/device.c b/src/device.c
index a3718a95..3fb4b1ed 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1106,7 +1106,6 @@ struct connman_network *connman_device_get_network(struct connman_device *device
int connman_device_remove_network(struct connman_device *device,
struct connman_network *network)
{
- struct connman_service *service;
const char *identifier;
DBG("device %p network %p", device, network);
@@ -1114,15 +1113,8 @@ int connman_device_remove_network(struct connman_device *device,
if (network == NULL)
return 0;
- service = __connman_service_lookup_from_network(network);
-
identifier = connman_network_get_identifier(network);
- g_hash_table_steal(device->networks, identifier);
-
- if (service != NULL)
- __connman_service_reset_from_networks(service, device->networks);
-
- free_network(network);
+ g_hash_table_remove(device->networks, identifier);
return 0;
}