diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-06-15 13:43:34 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-30 08:29:55 +0200 |
| commit | cc4371ef56db94e2ba47f895dcc0c697eea739ba (patch) | |
| tree | 4830c1542bb70d4e460fb47a761e12ddb4f64d06 /src/devices/nm-device-macvlan.c | |
| parent | eb3247c09707be41a34987b8d5e0037139f7bfb0 (diff) | |
| download | NetworkManager-cc4371ef56db94e2ba47f895dcc0c697eea739ba.tar.gz | |
device: fix matching MAC address for VLAN and MACVLAN devices
VLAN and MACVLAN devices consider an ethernet.mac-address setting
to find the parent device. This setting shall be the permanent MAC
address of the device, not the current.
Diffstat (limited to 'src/devices/nm-device-macvlan.c')
| -rw-r--r-- | src/devices/nm-device-macvlan.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c index f829f99c31..a238bdcf79 100644 --- a/src/devices/nm-device-macvlan.c +++ b/src/devices/nm-device-macvlan.c @@ -373,9 +373,8 @@ match_hwaddr (NMDevice *device, NMConnection *connection, gboolean fail_if_no_hw if (!priv->parent) return !fail_if_no_hwaddr; - parent_mac = nm_device_get_hw_address (priv->parent); - - return nm_utils_hwaddr_matches (setting_mac, -1, parent_mac, -1); + parent_mac = nm_device_get_permanent_hw_address (priv->parent, FALSE); + return parent_mac && nm_utils_hwaddr_matches (setting_mac, -1, parent_mac, -1); } static gboolean |