summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2015-12-15 18:45:15 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2015-12-15 18:48:23 +0100
commit960d3b31e30a37ec52284e6d5c5606591f166308 (patch)
treeccf74a19e1f6ce748283bd4e04a431b8e5ffeb52
parentecee315da1fa56805b6bd601b54cfbf200fa6692 (diff)
downloadNetworkManager-bg/device-zero-mac-fix-rh1288110.tar.gz
fixup! device: wait for valid MAC before making ethernet devices availablebg/device-zero-mac-fix-rh1288110
-rw-r--r--src/devices/nm-device-ethernet.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index f6560e5e00..6a87cfea66 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -1655,9 +1655,12 @@ link_changed (NMDevice *device, NMPlatformLink *info)
}
static gboolean
-is_available (NMDevice *self, NMDeviceCheckDevAvailableFlags flags)
+is_available (NMDevice *device, NMDeviceCheckDevAvailableFlags flags)
{
- return !!nm_device_get_initial_hw_address (self);
+ if (!NM_DEVICE_CLASS (nm_device_ethernet_parent_class)->is_available (device, flags))
+ return FALSE;
+
+ return !!nm_device_get_initial_hw_address (device);
}
static void