summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaesub kim <taesub.kim@samsung.com>2016-07-21 23:10:27 (GMT)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2016-07-21 23:10:27 (GMT)
commite70b86abc31de0593fbf98d276eed21c8c816962 (patch)
treeb4cac74f45b15865e4ffa20aff84754ea3f5dda2
parent746566255e1b32c76f6fd231c8d26415b6b57c34 (diff)
parentffac4f3e6667d2b6e1cda87303d6fdd9f2de6256 (diff)
downloadconnman-e70b86abc31de0593fbf98d276eed21c8c816962.zip
connman-e70b86abc31de0593fbf98d276eed21c8c816962.tar.gz
connman-e70b86abc31de0593fbf98d276eed21c8c816962.tar.bz2
Merge "Upstream: network: Replace network_change() with __connman_network_disconnect()" into tizen
-rwxr-xr-xsrc/network.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/network.c b/src/network.c
index d20385f..491515f 100755
--- a/src/network.c
+++ b/src/network.c
@@ -847,23 +847,6 @@ static void network_remove(struct connman_network *network)
network->driver = NULL;
}
-static void network_change(struct connman_network *network)
-{
- DBG("network %p name %s", network, network->name);
-
- if (!network->connected)
- return;
-
- connman_device_set_disconnected(network->device, true);
-
- if (network->driver && network->driver->disconnect) {
- network->driver->disconnect(network);
- return;
- }
-
- network->connected = false;
-}
-
static void probe_driver(struct connman_network_driver *driver)
{
GSList *list;
@@ -1470,9 +1453,6 @@ void connman_network_set_error(struct connman_network *network,
{
DBG("network %p error %d", network, error);
- network->connecting = false;
- network->associating = false;
-
switch (error) {
case CONNMAN_NETWORK_ERROR_UNKNOWN:
return;
@@ -1495,7 +1475,7 @@ void connman_network_set_error(struct connman_network *network,
#endif
}
- network_change(network);
+ __connman_network_disconnect(network);
}
/**
@@ -1516,8 +1496,7 @@ int connman_network_set_connected(struct connman_network *network,
!connected) {
connman_network_set_error(network,
CONNMAN_NETWORK_ERROR_CONNECT_FAIL);
- if (__connman_network_disconnect(network) == 0)
- return 0;
+ return 0;
}
if (network->connected == connected)