Remove new unused special carrier state of a service

diff --git a/doc/overview-api.txt b/doc/overview-api.txt
index 97677ae..8bc387d 100644 (file)
--- a/doc/overview-api.txt
+++ b/doc/overview-api.txt
@@ -256,10 +256,6 @@ The basic state of every service is "idle". This means that this service
 is not in use at all at the moment. It also is not attempting to connect
 or do anything else.
 
-With Ethernet services a special "carrier" state is available. It indicates
-that the cable has been plugged in. This state is only used when the device
-is from type Ethernet.
-
 The "association" state indicates that this service tries to establish a
 low-level connection to the network. For example associating/connecting
 with a WiFi access point.
@@ -283,13 +279,6 @@ the "idle" state since the service is not connected.
                +---------------+
                | idle          |<-------------------------------+
                +---------------+                                |
-                     |    |                                     |
-                     |    +----------------------+              |
-                     |                           |              |
-                     |                           V              |
-                     |                      +-------------+     |
-                     +----------------------| carrier     |<----+
-                     |                      +-------------+     |
                      |                                          |
                      |                      +-------------+     |
                      +----------------------| failure     |     |

diff --git a/include/service.h b/include/service.h
index 3ec7125..ec80ab3 100644 (file)
--- a/include/service.h
+++ b/include/service.h
@@ -63,10 +63,9 @@ enum connman_service_security {
 enum connman_service_state {
        CONNMAN_SERVICE_STATE_UNKNOWN       = 0,
        CONNMAN_SERVICE_STATE_IDLE          = 1,
-       CONNMAN_SERVICE_STATE_CARRIER       = 2,
-       CONNMAN_SERVICE_STATE_ASSOCIATION   = 3,
-       CONNMAN_SERVICE_STATE_CONFIGURATION = 4,
-       CONNMAN_SERVICE_STATE_READY         = 5,
+       CONNMAN_SERVICE_STATE_ASSOCIATION   = 2,
+       CONNMAN_SERVICE_STATE_CONFIGURATION = 3,
+       CONNMAN_SERVICE_STATE_READY         = 4,
        CONNMAN_SERVICE_STATE_DISCONNECT    = 6,
        CONNMAN_SERVICE_STATE_FAILURE       = 7,
 };

diff --git a/src/service.c b/src/service.c
index 9caa505..c4485ac 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -180,8 +180,6 @@ static const char *state2string(enum connman_service_state state)
                break;
        case CONNMAN_SERVICE_STATE_IDLE:
                return "idle";
-       case CONNMAN_SERVICE_STATE_CARRIER:
-               return "carrier";
        case CONNMAN_SERVICE_STATE_ASSOCIATION:
                return "association";
        case CONNMAN_SERVICE_STATE_CONFIGURATION:
@@ -818,7 +816,6 @@ static connman_bool_t is_connecting(struct connman_service *service)
        switch (service->state) {
        case CONNMAN_SERVICE_STATE_UNKNOWN:
        case CONNMAN_SERVICE_STATE_IDLE:
-       case CONNMAN_SERVICE_STATE_CARRIER:
        case CONNMAN_SERVICE_STATE_FAILURE:
        case CONNMAN_SERVICE_STATE_DISCONNECT:
        case CONNMAN_SERVICE_STATE_READY: