core: Remove WiMAX definitions from code

[platform/upstream/connman.git] / src / technology.c

diff --git a/src/technology.c b/src/technology.c
index 290ec24..8166d17 100644 (file)
--- a/src/technology.c
+++ b/src/technology.c
@@ -223,6 +223,10 @@ static int set_tethering(struct connman_technology *technology,
                        technology->driver->set_tethering == NULL)
                return -EOPNOTSUPP;
 
+       __sync_synchronize();
+       if (technology->enabled == FALSE)
+               return -EACCES;
+
        bridge = __connman_tethering_get_bridge();
        if (bridge == NULL)
                return -EOPNOTSUPP;
@@ -304,8 +308,6 @@ static const char *get_name(enum connman_service_type type)
                return "Wired";
        case CONNMAN_SERVICE_TYPE_WIFI:
                return "WiFi";
-       case CONNMAN_SERVICE_TYPE_WIMAX:
-               return "WiMAX";
        case CONNMAN_SERVICE_TYPE_BLUETOOTH:
                return "Bluetooth";
        case CONNMAN_SERVICE_TYPE_CELLULAR:
@@ -920,7 +922,7 @@ static const GDBusSignalTable technology_signals[] = {
 static gboolean technology_dbus_register(struct connman_technology *technology)
 {
        if (technology->dbus_registered == TRUE ||
-                               (technology->rfkill_driven &&
+                               (technology->rfkill_driven == TRUE &&
                                 technology->hardblocked == TRUE))
                return TRUE;
 
@@ -982,11 +984,7 @@ static struct connman_technology *technology_get(enum connman_service_type type)
 
        technology->rfkill_driven = FALSE;
        technology->softblocked = FALSE;
-
-       if (type == CONNMAN_SERVICE_TYPE_ETHERNET)
-               technology->hardblocked = FALSE;
-       else
-               technology->hardblocked = TRUE;
+       technology->hardblocked = FALSE;
 
        technology->type = type;
        technology->path = g_strdup_printf("%s/technology/%s",
@@ -1065,7 +1063,6 @@ void __connman_technology_add_interface(enum connman_service_type type,
                return;
        case CONNMAN_SERVICE_TYPE_ETHERNET:
        case CONNMAN_SERVICE_TYPE_WIFI:
-       case CONNMAN_SERVICE_TYPE_WIMAX:
        case CONNMAN_SERVICE_TYPE_BLUETOOTH:
        case CONNMAN_SERVICE_TYPE_CELLULAR:
        case CONNMAN_SERVICE_TYPE_GPS:
@@ -1098,7 +1095,6 @@ void __connman_technology_remove_interface(enum connman_service_type type,
                return;
        case CONNMAN_SERVICE_TYPE_ETHERNET:
        case CONNMAN_SERVICE_TYPE_WIFI:
-       case CONNMAN_SERVICE_TYPE_WIMAX:
        case CONNMAN_SERVICE_TYPE_BLUETOOTH:
        case CONNMAN_SERVICE_TYPE_CELLULAR:
        case CONNMAN_SERVICE_TYPE_GPS:
@@ -1454,8 +1450,8 @@ done:
                                technology->enable_persistent == TRUE)
                return __connman_rfkill_block(type, FALSE);
        else if (technology->softblocked == FALSE &&
-                               global_offlinemode == TRUE &&
-                               technology->enable_persistent == FALSE)
+                       (global_offlinemode == TRUE ||
+                               technology->enable_persistent == FALSE))
                return __connman_rfkill_block(type, TRUE);
 
        return 0;