From c3586ce01a5b73005f9b003fb8f342b89e4f4a5d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 23 Sep 2016 20:26:07 +0200 Subject: [PATCH] device: consider a device with slaves configured Do assume connections for it. https://bugzilla.redhat.com/show_bug.cgi?id=1333983 --- src/devices/nm-device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index c6d5f87f6..e5e6056dd 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1549,7 +1549,7 @@ is_unmanaged_external_down (NMDevice *self, gboolean consider_can) /* Manage externally-created software interfaces only when they are IFF_UP */ if ( priv->ifindex <= 0 || !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_MANAGED; @@ -3246,8 +3246,8 @@ device_has_config (NMDevice *self) if (nm_device_is_software (self) && nm_device_is_real (self)) return TRUE; - /* Slaves are also configured by definition */ - if (nm_platform_link_get_master (NM_PLATFORM_GET, priv->ifindex) > 0) + /* Master-slave relationship is also a configuration */ + if (priv->slaves || nm_platform_link_get_master (NM_PLATFORM_GET, priv->ifindex) > 0) return TRUE; return FALSE;