element: Remove IPv4
authorDaniel Wagner <daniel.wagner@bmw-carit.de>
Tue, 31 May 2011 15:43:48 +0000 (17:43 +0200)
committerDaniel Wagner <daniel.wagner@bmw-carit.de>
Tue, 31 May 2011 15:50:43 +0000 (17:50 +0200)
include/element.h
src/device.c
src/network.c

index 6059191..7f96de2 100644 (file)
@@ -93,19 +93,6 @@ struct connman_element {
        struct {
                enum connman_ipconfig_method method;
                gchar *address;
-               gchar *peer;
-               gchar *netmask;
-               gchar *gateway;
-               gchar *network;
-               gchar *broadcast;
-               gchar *nameserver;
-               gchar *timeserver;
-               gchar *pac;
-       } ipv4;
-
-       struct {
-               enum connman_ipconfig_method method;
-               gchar *address;
                int prefix_len;
                gchar *gateway;
                gchar *network;
index ed0eaf2..12e1460 100644 (file)
@@ -487,8 +487,6 @@ struct connman_device *connman_device_create(const char *node,
                connman_element_set_string(&device->element,
                                        CONNMAN_PROPERTY_ID_TYPE, str);
 
-       device->element.ipv4.method = CONNMAN_IPCONFIG_METHOD_DHCP;
-
        device->type = type;
        device->name = g_strdup(type2description(device->type));
 
index a29783f..07ec1a3 100644 (file)
@@ -561,8 +561,6 @@ void connman_network_set_ipv4_method(struct connman_network *network,
        struct connman_service *service;
        struct connman_ipconfig *ipconfig;
 
-       network->element.ipv4.method = method;
-
        service = __connman_service_lookup_from_network(network);
        if (service == NULL)
                return;