From 66615310624a310b6ec5c124afc14554739796fa Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 19 May 2014 09:56:29 -0400 Subject: [PATCH] devices: fix link-changed refactoring Thomas points out that the previous refactoring moved the link_changed() virtual method invocation relative to update_for_ip_ifname_change(), which could have weird side effects given the things that can happen there. So move it back. --- src/devices/nm-device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index b2f3d723a7..69ba364fe4 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1192,14 +1192,15 @@ device_link_changed (NMDevice *device, NMPlatformLink *info) * to auto-activate on the device. */ nm_device_emit_recheck_auto_activate (device); - - /* Update DHCP, etc, if needed */ - if (ip_ifname_changed) - update_for_ip_ifname_change (device); } if (klass->link_changed) klass->link_changed (device, info); + + + /* Update DHCP, etc, if needed */ + if (ip_ifname_changed) + update_for_ip_ifname_change (device); } static void