device: Add driver capability to set regulatory domain on device basis

[framework/connectivity/connman.git] / src / technology.c

diff --git a/src/technology.c b/src/technology.c
index 635c7b0..3781b0c 100644 (file)
--- a/src/technology.c
+++ b/src/technology.c
@@ -609,7 +609,10 @@ done:
                        technology->pending_timeout = g_timeout_add_seconds(10,
                                        technology_pending_reply, technology);
                } else {
-                       reply = __connman_error_failed(msg, -err);
+                       if (err == -EALREADY)
+                               reply = __connman_error_already_enabled(msg);
+                       else
+                               reply = __connman_error_failed(msg, -err);
                        if (reply != NULL)
                                g_dbus_send_message(connection, reply);
                }
@@ -670,7 +673,10 @@ done:
                        technology->pending_timeout = g_timeout_add_seconds(10,
                                        technology_pending_reply, technology);
                } else {
-                       reply = __connman_error_failed(msg, -err);
+                       if (err == -EALREADY)
+                               reply = __connman_error_already_disabled(msg);
+                       else
+                               reply = __connman_error_failed(msg, -err);
                        if (reply != NULL)
                                g_dbus_send_message(connection, reply);
                }
@@ -1131,8 +1137,10 @@ int __connman_technology_enabled(enum connman_service_type type)
        if (technology == NULL)
                return -ENXIO;
 
-       if (__sync_fetch_and_add(&technology->enabled, 1) == 0)
-               powered_changed(technology);
+       if (__sync_fetch_and_add(&technology->enabled, 1) != 0)
+               return -EALREADY;
+
+       powered_changed(technology);
 
        if (technology->pending_reply != NULL) {
                g_dbus_send_reply(connection, technology->pending_reply, DBUS_TYPE_INVALID);
@@ -1153,6 +1161,9 @@ int __connman_technology_disabled(enum connman_service_type type)
        if (technology == NULL)
                return -ENXIO;
 
+       if (__sync_fetch_and_sub(&technology->enabled, 1) != 1)
+               return -EINPROGRESS;
+
        if (technology->pending_reply != NULL) {
                g_dbus_send_reply(connection, technology->pending_reply, DBUS_TYPE_INVALID);
                dbus_message_unref(technology->pending_reply);
@@ -1161,8 +1172,7 @@ int __connman_technology_disabled(enum connman_service_type type)
                technology->pending_timeout = 0;
        }
 
-       if (__sync_fetch_and_sub(&technology->enabled, 1) == 1)
-               powered_changed(technology);
+       powered_changed(technology);
 
        return 0;
 }