From 76359ac3fd89af2002afbf0cf1ebe0aa222bcff8 Mon Sep 17 00:00:00 2001
From: Daniel Wagner <daniel.wagner@bmw-carit.de>
Date: Thu, 4 Aug 2011 17:35:36 +0200
Subject: [PATCH] service: Remove __connman_service_reset_from_networks()

This is not needed because there is only 1 network per
service.

Fixes BMC#22078
---
 src/connman.h |  1 -
 src/device.c  | 10 +---------
 src/service.c | 37 -------------------------------------
 3 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/src/connman.h b/src/connman.h
index 1dc6e51..fe22924 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -470,7 +470,6 @@ struct connman_service *__connman_service_create_from_network(struct connman_net
 struct connman_service *__connman_service_create_from_provider(struct connman_provider *provider);
 void __connman_service_update_from_network(struct connman_network *network);
 void __connman_service_remove_from_network(struct connman_network *network);
-void __connman_service_reset_from_networks(struct connman_service *service, GHashTable *networks);
 
 void __connman_service_create_ip4config(struct connman_service *service,
 								int index);
diff --git a/src/device.c b/src/device.c
index a3718a9..3fb4b1e 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;
 }
diff --git a/src/service.c b/src/service.c
index 2249863..e88190c 100644
--- a/src/service.c
+++ b/src/service.c
@@ -4977,43 +4977,6 @@ void __connman_service_remove_from_network(struct connman_network *network)
 	__connman_service_put(service);
 }
 
-void __connman_service_reset_from_networks(struct connman_service *service,
-						GHashTable *networks)
-{
-	struct connman_network *network;
-	GHashTableIter iter;
-	gpointer key, value;
-
-	DBG("service %p", service);
-
-	network = NULL;
-
-	g_hash_table_iter_init(&iter, networks);
-
-	while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
-		struct connman_network *iter_network = value;
-		uint8_t strength, iter_strength;
-
-		if (network == NULL) {
-			network = iter_network;
-			continue;
-		}
-
-		strength = connman_network_get_strength(network);
-		iter_strength = connman_network_get_strength(iter_network);
-
-		if (iter_strength > strength)
-			network = iter_network;
-	}
-
-	if (network == NULL) {
-		service->network = NULL;
-		return;
-	}
-
-	__connman_service_create_from_network(network);
-}
-
 /**
  * __connman_service_create_from_provider:
  * @provider: provider structure
-- 
2.7.4