}
if (state_a == CONNMAN_SERVICE_STATE_READY) {
- if (state_b == CONNMAN_SERVICE_STATE_ONLINE)
+ if (state_b == CONNMAN_SERVICE_STATE_ONLINE ||
+ state_b == CONNMAN_SERVICE_STATE_DISCONNECT)
result = state_b;
else
result = state_a;
}
if (state_b == CONNMAN_SERVICE_STATE_READY) {
- if (state_a == CONNMAN_SERVICE_STATE_ONLINE)
+ if (state_a == CONNMAN_SERVICE_STATE_ONLINE ||
+ state_a == CONNMAN_SERVICE_STATE_DISCONNECT)
result = state_a;
else
result = state_b;
}
if (state_a == CONNMAN_SERVICE_STATE_DISCONNECT) {
- result = state_b;
+ result = state_a;
goto done;
}
if (state_b == CONNMAN_SERVICE_STATE_DISCONNECT) {
- result = state_a;
+ result = state_b;
goto done;
}