summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaesub kim <taesub.kim@samsung.com>2016-06-13 02:18:05 (GMT)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2016-06-13 02:18:05 (GMT)
commit668f527b10857b9d1086474f7510b19418af89e9 (patch)
tree5130d4aa99570806bfa75e1aaa291e458bddda09
parente39a8d93aad30e9fa3b27ae0d951bfa0017513cd (diff)
parentf651132629aaa9af3f29ee9276bf421ff1aa7660 (diff)
downloadconnman-668f527b10857b9d1086474f7510b19418af89e9.zip
connman-668f527b10857b9d1086474f7510b19418af89e9.tar.gz
connman-668f527b10857b9d1086474f7510b19418af89e9.tar.bz2
Merge "[SPIN] network: connman_network_clear_associating rather than IDLE state" into tizen
-rwxr-xr-xsrc/network.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/network.c b/src/network.c
index ad67746..4b2ae11 100755
--- a/src/network.c
+++ b/src/network.c
@@ -1311,15 +1311,8 @@ static gboolean __connman_network_clear_associating_delayed(gpointer user_data)
if (network->associating == FALSE &&
state_ipv4 == CONNMAN_SERVICE_STATE_ASSOCIATION &&
- state_ipv6 == CONNMAN_SERVICE_STATE_ASSOCIATION) {
- __connman_service_ipconfig_indicate_state(service,
- CONNMAN_SERVICE_STATE_IDLE,
- CONNMAN_IPCONFIG_TYPE_IPV4);
-
- __connman_service_ipconfig_indicate_state(service,
- CONNMAN_SERVICE_STATE_IDLE,
- CONNMAN_IPCONFIG_TYPE_IPV6);
- }
+ state_ipv6 == CONNMAN_SERVICE_STATE_ASSOCIATION)
+ connman_network_clear_associating(network);
return FALSE;
}