colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trivial: clarify has_ip_config()

Browse Source 
Make it more explicit that it returns TRUE for UNMANAGED state.
This commit is contained in:
Pavel Šimerda
2013-06-28 21:05:20 +02:00
parent 46abdf254c
commit f548a49782
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/nm-device.c
View File

@@ -4963,9 +4963,11 @@ has_ip_config (NMDevice *self)
if (priv->ip4_state != IP_DONE && priv->ip6_state != IP_DONE) if (priv->ip4_state != IP_DONE && priv->ip6_state != IP_DONE)
return FALSE; return FALSE;
return ( ( priv->state >= NM_DEVICE_STATE_IP_CONFIG if (priv->state == NM_DEVICE_STATE_UNMANAGED)
&& priv->state <= NM_DEVICE_STATE_DEACTIVATING) return TRUE;
|| (priv->state == NM_DEVICE_STATE_UNMANAGED));
return (priv->state >= NM_DEVICE_STATE_IP_CONFIG
&& priv->state <= NM_DEVICE_STATE_DEACTIVATING);
} }
static void static void