From f548a497826e7bc3da663dd0073b15fea0eec32f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0imerda?= Date: Fri, 28 Jun 2013 21:05:20 +0200 Subject: [PATCH] trivial: clarify has_ip_config() Make it more explicit that it returns TRUE for UNMANAGED state. --- src/devices/nm-device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 178d50f20..76441d3ed 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4963,9 +4963,11 @@ has_ip_config (NMDevice *self) if (priv->ip4_state != IP_DONE && priv->ip6_state != IP_DONE) return FALSE; - return ( ( priv->state >= NM_DEVICE_STATE_IP_CONFIG - && priv->state <= NM_DEVICE_STATE_DEACTIVATING) - || (priv->state == NM_DEVICE_STATE_UNMANAGED)); + if (priv->state == NM_DEVICE_STATE_UNMANAGED) + return TRUE; + + return (priv->state >= NM_DEVICE_STATE_IP_CONFIG + && priv->state <= NM_DEVICE_STATE_DEACTIVATING); } static void