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:
d5fcad5
)
service: disconnect state has priority over online one.
author
Tomasz Bursztyka
<tomasz.bursztyka@linux.intel.com>
Fri, 8 Jul 2011 17:04:37 +0000
(20:04 +0300)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Fri, 8 Jul 2011 18:01:36 +0000
(20:01 +0200)
src/service.c
patch
|
blob
|
history
diff --git
a/src/service.c
b/src/service.c
index
495e4de
..
bfd94a5
100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-381,12
+381,18
@@
static enum connman_service_state combine_state(
}
if (state_a == CONNMAN_SERVICE_STATE_ONLINE) {
- result = state_a;
+ if (state_b == CONNMAN_SERVICE_STATE_DISCONNECT)
+ result = state_b;
+ else
+ result = state_a;
goto done;
}
if (state_b == CONNMAN_SERVICE_STATE_ONLINE) {
- result = state_b;
+ if (state_a == CONNMAN_SERVICE_STATE_DISCONNECT)
+ result = state_a;
+ else
+ result = state_b;
goto done;
}