From f3158371a6391828f55a0418015772a7db6348ee Mon Sep 17 00:00:00 2001 From: Yu A Wang Date: Mon, 7 Nov 2011 21:32:25 -0500 Subject: network: Fix failed to reconnect to 3G network when connect failed When connect failed, set the associating value to false again, else when we connect again the return err will be EALREADY. --- src/network.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/network.c') diff --git a/src/network.c b/src/network.c index 090b7e73..f9dfada2 100644 --- a/src/network.c +++ b/src/network.c @@ -653,11 +653,6 @@ static void set_associate_error(struct connman_network *network) { struct connman_service *service; - if (network->associating == FALSE) - return ; - - network->associating = FALSE; - service = __connman_service_lookup_from_network(network); __connman_service_ipconfig_indicate_state(service, @@ -669,8 +664,6 @@ static void set_configure_error(struct connman_network *network) { struct connman_service *service; - network->connecting = FALSE; - service = __connman_service_lookup_from_network(network); __connman_service_ipconfig_indicate_state(service, @@ -738,6 +731,7 @@ void connman_network_set_error(struct connman_network *network, DBG("nework %p, error %d", network, error); network->connecting = FALSE; + network->associating = FALSE; switch (error) { case CONNMAN_NETWORK_ERROR_UNKNOWN: -- cgit v1.2.3