Use ignore method for unconfigured IP devices

diff --git a/include/ipconfig.h b/include/ipconfig.h
index 8477ede..0f09ff1 100644 (file)
--- a/include/ipconfig.h
+++ b/include/ipconfig.h
@@ -40,7 +40,7 @@ enum connman_ipconfig_type {
 
 enum connman_ipconfig_method {
        CONNMAN_IPCONFIG_METHOD_UNKNOWN = 0,
-       CONNMAN_IPCONFIG_METHOD_OFF     = 1,
+       CONNMAN_IPCONFIG_METHOD_IGNORE  = 1,
        CONNMAN_IPCONFIG_METHOD_STATIC  = 2,
        CONNMAN_IPCONFIG_METHOD_DHCP    = 3,
 };

diff --git a/src/device.c b/src/device.c
index b29fb6b..17720e5 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -199,7 +199,7 @@ static int set_connected(struct connman_device *device,
 
                switch (device->element.ipv4.method) {
                case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
-               case CONNMAN_IPCONFIG_METHOD_OFF:
+               case CONNMAN_IPCONFIG_METHOD_IGNORE:
                        return 0;
                case CONNMAN_IPCONFIG_METHOD_STATIC:
                        type = CONNMAN_ELEMENT_TYPE_IPV4;

diff --git a/src/ipconfig.c b/src/ipconfig.c
index d5f3a10..0503b35 100644 (file)
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -542,8 +542,8 @@ const char *__connman_ipconfig_method2string(enum connman_ipconfig_method method
        switch (method) {
        case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
                break;
-       case CONNMAN_IPCONFIG_METHOD_OFF:
-               return "off";
+       case CONNMAN_IPCONFIG_METHOD_IGNORE:
+               return "ignore";
        case CONNMAN_IPCONFIG_METHOD_STATIC:
                return "static";
        case CONNMAN_IPCONFIG_METHOD_DHCP:
@@ -555,8 +555,8 @@ const char *__connman_ipconfig_method2string(enum connman_ipconfig_method method
 
 enum connman_ipconfig_method __connman_ipconfig_string2method(const char *method)
 {
-       if (g_strcmp0(method, "off") == 0)
-               return CONNMAN_IPCONFIG_METHOD_OFF;
+       if (g_strcmp0(method, "ignore") == 0)
+               return CONNMAN_IPCONFIG_METHOD_IGNORE;
        else if (g_strcmp0(method, "static") == 0)
                return CONNMAN_IPCONFIG_METHOD_STATIC;
        else if (g_strcmp0(method, "dhcp") == 0)