All WiFi properties are now part of network interface

diff --git a/include/element.h b/include/element.h
index 9bb617e..17f96e4 100644 (file)
--- a/include/element.h
+++ b/include/element.h
@@ -92,11 +92,6 @@ struct connman_element {
                gchar *broadcast;
                gchar *nameserver;
        } ipv4;
-
-       struct {
-               gchar *security;
-               gchar *passphrase;
-       } wifi;
 };
 
 extern struct connman_element *connman_element_create(const char *name);

diff --git a/include/property.h b/include/property.h
index 35dbe5c..e792487 100644 (file)
--- a/include/property.h
+++ b/include/property.h
@@ -41,9 +41,6 @@ enum connman_property_id {
        CONNMAN_PROPERTY_ID_IPV4_GATEWAY,
        CONNMAN_PROPERTY_ID_IPV4_BROADCAST,
        CONNMAN_PROPERTY_ID_IPV4_NAMESERVER,
-
-       CONNMAN_PROPERTY_ID_WIFI_SECURITY,
-       CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE,
 };
 
 /**

diff --git a/src/element.c b/src/element.c
index 9dbcd68..6f347a7 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -58,12 +58,6 @@ static struct {
                DBUS_TYPE_STRING, "IPv4.Broadcast" },
        { CONNMAN_PROPERTY_ID_IPV4_NAMESERVER,
                DBUS_TYPE_STRING, "IPv4.Nameserver" },
-
-       { CONNMAN_PROPERTY_ID_WIFI_SECURITY,
-               DBUS_TYPE_STRING, "WiFi.Security" },
-       { CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE,
-               DBUS_TYPE_STRING, "WiFi.Passphrase" },
-
        { }
 };
 
@@ -949,18 +943,6 @@ int connman_element_set_property(struct connman_element *element,
                element->ipv4.nameserver = g_strdup(*((const char **) value));
                __connman_element_unlock(element);
                break;
-       case CONNMAN_PROPERTY_ID_WIFI_SECURITY:
-               __connman_element_lock(element);
-               g_free(element->wifi.security);
-               element->wifi.security = g_strdup(*((const char **) value));
-               __connman_element_unlock(element);
-               break;
-       case CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE:
-               __connman_element_lock(element);
-               g_free(element->wifi.passphrase);
-               element->wifi.passphrase = g_strdup(*((const char **) value));
-               __connman_element_unlock(element);
-               break;
        default:
                return -EINVAL;
        }
@@ -1023,22 +1005,6 @@ int connman_element_get_value(struct connman_element *element,
                *((char **) value) = element->ipv4.nameserver;
                __connman_element_unlock(element);
                break;
-       case CONNMAN_PROPERTY_ID_WIFI_SECURITY:
-               if (element->wifi.security == NULL)
-                       return connman_element_get_value(element->parent,
-                                                               id, value);
-               __connman_element_lock(element);
-               *((char **) value) = element->wifi.security;
-               __connman_element_unlock(element);
-               break;
-       case CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE:
-               if (element->wifi.passphrase == NULL)
-                       return connman_element_get_value(element->parent,
-                                                               id, value);
-               __connman_element_lock(element);
-               *((char **) value) = element->wifi.passphrase;
-               __connman_element_unlock(element);
-               break;
        default:
                return -EINVAL;
        }