projects
/
platform
/
upstream
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
technology: Refactor enable/disable APIs
[platform/upstream/connman.git]
/
src
/
manager.c
diff --git
a/src/manager.c
b/src/manager.c
index
d5542fd
..
a276e0b
100644
(file)
--- a/
src/manager.c
+++ b/
src/manager.c
@@
-343,8
+343,8
@@
static DBusMessage *enable_technology(DBusConnection *conn,
technology_enabled = TRUE;
technology_pending = dbus_message_ref(msg);
technology_enabled = TRUE;
technology_pending = dbus_message_ref(msg);
- err = __connman_
device_enable_technology
(type);
- if (err < 0
&& err != -EINPROGRESS
)
+ err = __connman_
technology_enable
(type);
+ if (err < 0)
technology_reply(-err);
else
technology_timeout = g_timeout_add_seconds(15,
technology_reply(-err);
else
technology_timeout = g_timeout_add_seconds(15,
@@
-391,8
+391,8
@@
static DBusMessage *disable_technology(DBusConnection *conn,
technology_enabled = FALSE;
technology_pending = dbus_message_ref(msg);
technology_enabled = FALSE;
technology_pending = dbus_message_ref(msg);
- err = __connman_
device_disable_technology
(type);
- if (err < 0
&& err != -EINPROGRESS
)
+ err = __connman_
technology_disable
(type);
+ if (err < 0)
technology_reply(-err);
else
technology_timeout = g_timeout_add_seconds(10,
technology_reply(-err);
else
technology_timeout = g_timeout_add_seconds(10,