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

device: consider a device with slaves configured

Browse Source 
Do assume connections for it.

https://bugzilla.redhat.com/show_bug.cgi?id=1333983
This commit is contained in:
Lubomir Rintel
2016-09-23 20:26:07 +02:00
parent eb3dd9b679
commit c3586ce01a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1549,7 +1549,7 @@ is_unmanaged_external_down (NMDevice *self, gboolean consider_can)
/* Manage externally-created software interfaces only when they are IFF_UP */ /* Manage externally-created software interfaces only when they are IFF_UP */
if ( priv->ifindex <= 0 if ( priv->ifindex <= 0
|| !priv->up || !priv->up
|| !nm_platform_link_can_assume (NM_PLATFORM_GET, priv->ifindex)) || !(priv->slaves || nm_platform_link_can_assume (NM_PLATFORM_GET, priv->ifindex)))
return NM_UNMAN_FLAG_OP_SET_UNMANAGED; return NM_UNMAN_FLAG_OP_SET_UNMANAGED;
return NM_UNMAN_FLAG_OP_SET_MANAGED; return NM_UNMAN_FLAG_OP_SET_MANAGED;
@@ -3246,8 +3246,8 @@ device_has_config (NMDevice *self)
if (nm_device_is_software (self) && nm_device_is_real (self)) if (nm_device_is_software (self) && nm_device_is_real (self))
return TRUE; return TRUE;
/* Slaves are also configured by definition */ /* Master-slave relationship is also a configuration */
if (nm_platform_link_get_master (NM_PLATFORM_GET, priv->ifindex) > 0) if (priv->slaves || nm_platform_link_get_master (NM_PLATFORM_GET, priv->ifindex) > 0)
return TRUE; return TRUE;
return FALSE; return FALSE;