projects
/
platform
/
upstream
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e72ebd5
)
Reset the connecting and associating variables properly
author
Marcel Holtmann
<marcel@holtmann.org>
Thu, 16 Jul 2009 05:27:34 +0000
(07:27 +0200)
committer
Marcel Holtmann
<marcel@holtmann.org>
Thu, 16 Jul 2009 05:27:34 +0000
(07:27 +0200)
src/network.c
patch
|
blob
|
history
diff --git
a/src/network.c
b/src/network.c
index
3f05dfe
..
be9a566
100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-762,6
+762,7
@@
static gboolean set_connected(gpointer user_data)
}
network->connecting = FALSE;
+ network->associating = FALSE;
return FALSE;
}
@@
-789,14
+790,16
@@
int connman_network_set_connected(struct connman_network *network,
__connman_network_disconnect(network);
}
+ if (connected == TRUE) {
+ network->connecting = FALSE;
+ network->associating = FALSE;
+ }
+
if (network->connected == connected)
return -EALREADY;
network->connected = connected;
- if (connected == TRUE)
- network->associating = FALSE;
-
if (network->registered == FALSE) {
g_idle_add(set_connected, network);
return 0;