From: Tom Gundersen <teg@jklm.no>
Date: Thu, 17 Jul 2014 14:49:39 +0000 (+0200)
Subject: sd-network: expose 'unmanaged' as a regular state
X-Git-Tag: v216~523
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=560852ced07a647e2d288ce2932aaf608712867d;p=elogind.git

sd-network: expose 'unmanaged' as a regular state

This is useful to save in the consumer of the lib, unlike ENODATA/EBUSY which
means that the user should wait until a useful state is available.
---

diff --git a/src/network/sd-network.c b/src/network/sd-network.c
index 1b7518fd9..50e5d9be1 100644
--- a/src/network/sd-network.c
+++ b/src/network/sd-network.c
@@ -85,9 +85,7 @@ _public_ int sd_network_get_link_state(unsigned index, char **state) {
         else if (!s)
                 return -EIO;
 
-        if (streq(s, "unmanaged"))
-                return -EUNATCH;
-        else if (streq(s, "initializing"))
+        if (streq(s, "initializing"))
                 return -EBUSY;
 
         *state = s;
diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h
index 45fd3ce08..3f7948222 100644
--- a/src/systemd/sd-network.h
+++ b/src/systemd/sd-network.h
@@ -52,10 +52,9 @@
 _SD_BEGIN_DECLARATIONS;
 
 /* Get state from ifindex.
- * Possible states: failed, configuring, configured
+ * Possible states: failed, configuring, configured, unmanaged
  * Possible return codes:
  *   -ENODATA: networkd is not aware of the link
- *   -EUNATCH: networkd is not managing this link
  *   -EBUSY: udev is still processing the link, networkd does not yet know if it will manage it
  */
 int sd_network_get_link_state(unsigned ifindex, char **state);