summaryrefslogtreecommitdiff
path: root/plugins/wifi.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 /plugins/wifi.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 'plugins/wifi.c')
-rw-r--r--plugins/wifi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/wifi.c b/plugins/wifi.c
index f4e51b24..8a7da099 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -793,8 +793,6 @@ static void network_added(GSupplicantNetwork *supplicant_network)
if (network == NULL)
return;
- connman_network_register(network);
-
connman_network_set_index(network, wifi->index);
if (connman_device_add_network(wifi->device, network) < 0) {
@@ -835,10 +833,12 @@ static void network_removed(GSupplicantNetwork *network)
if (wifi != NULL) {
connman_network = connman_device_get_network(wifi->device, identifier);
- if (connman_network != NULL)
- connman_network_unregister(connman_network);
connman_device_remove_network(wifi->device, identifier);
+
+ if (connman_network != NULL)
+ connman_network_unref(connman_network);
+
}
}