From 54f6333410ffd570e62717d9e77c5c987175e397 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Dec 2015 00:24:58 +0100 Subject: Imported Upstream version 1.0.10 --- src/devices/nm-device-vlan.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/devices/nm-device-vlan.c') diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index b330397f..7cce6593 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -96,7 +96,7 @@ parent_hwaddr_changed (NMDevice *parent, NMDeviceVlan *self = NM_DEVICE_VLAN (user_data); NMConnection *connection; NMSettingWired *s_wired; - const char *cloned_mac = NULL; + const char *cloned_mac = NULL, *new_mac; /* Never touch assumed devices */ if (nm_device_uses_assumed_connection (self)) @@ -112,9 +112,13 @@ parent_hwaddr_changed (NMDevice *parent, cloned_mac = nm_setting_wired_get_cloned_mac_address (s_wired); if (!cloned_mac) { - _LOGD (LOGD_VLAN, "parent hardware address changed"); - nm_device_set_hw_addr (self, nm_device_get_hw_address (parent), - "set", LOGD_VLAN); + new_mac = nm_device_get_hw_address (parent); + _LOGD (LOGD_VLAN, "parent hardware address changed to %s%s%s", + NM_PRINT_FMT_QUOTE_STRING (new_mac)); + if (new_mac) { + nm_device_set_hw_addr (self, nm_device_get_hw_address (parent), + "set", LOGD_VLAN); + } } } -- cgit 1.3.0-6-gf8a5