summaryrefslogtreecommitdiff
path: root/src/network.c
diff options
context:
space:
mode:
authorYu A Wang <arron.wang@intel.com>2011-11-07 21:32:25 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2011-11-10 13:39:08 +0100
commitf3158371a6391828f55a0418015772a7db6348ee (patch)
treecf4a5f06c09558806f8f531998a5d313659c500a /src/network.c
parent03aff0e1f0489dd823305d37e693067f15035a66 (diff)
downloadconnman-f3158371a6391828f55a0418015772a7db6348ee.tar.gz
connman-f3158371a6391828f55a0418015772a7db6348ee.tar.bz2
connman-f3158371a6391828f55a0418015772a7db6348ee.zip
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.
Diffstat (limited to 'src/network.c')
-rw-r--r--src/network.c8
1 files changed, 1 insertions, 7 deletions
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: