summaryrefslogtreecommitdiff
path: root/src/network.c
diff options
context:
space:
mode:
authorDaniel Wagner <daniel.wagner@bmw-carit.de>2011-07-25 16:24:30 +0200
committerMarcel Holtmann <marcel@holtmann.org>2011-07-26 01:21:06 +0200
commit04b5b05b64a613ced1b78ce6e9859f1e10032534 (patch)
tree5248ef24bd922caf8baf005446427a98f9542ee8 /src/network.c
parent4c769d10c89d516c6901243142b1efa64ab208ad (diff)
downloadconnman-04b5b05b64a613ced1b78ce6e9859f1e10032534.tar.gz
connman-04b5b05b64a613ced1b78ce6e9859f1e10032534.tar.bz2
connman-04b5b05b64a613ced1b78ce6e9859f1e10032534.zip
network: Remove connman_network_register/unregister()
Since the service object doesn't take a reference the intermediate step of having a connman_network_register/unregister is not needed. This function are only there to have an additional step where probe()/remove() will be called. This is the job of connman_device_add_network()/connman_device_remove_network().
Diffstat (limited to 'src/network.c')
-rw-r--r--src/network.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/network.c b/src/network.c
index 06aec05b..220164a3 100644
--- a/src/network.c
+++ b/src/network.c
@@ -242,21 +242,6 @@ static void probe_driver(struct connman_network_driver *driver)
}
}
-int connman_network_register(struct connman_network *network)
-{
- network_list = g_slist_append(network_list, network);
-
- return network_probe(network);
-}
-
-
-void connman_network_unregister(struct connman_network *network)
-{
- network_list = g_slist_remove(network_list, network);
-
- network_remove(network);
-}
-
static void remove_driver(struct connman_network_driver *driver)
{
GSList *list;
@@ -391,6 +376,8 @@ struct connman_network *connman_network_create(const char *identifier,
network->type = type;
network->identifier = ident;
+ network_list = g_slist_append(network_list, network);
+
return network;
}
@@ -424,6 +411,8 @@ void connman_network_unref(struct connman_network *network)
if (g_atomic_int_dec_and_test(&network->refcount) == FALSE)
return;
+ network_list = g_slist_remove(network_list, network);
+
network_destruct(network);
}