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.
This commit is contained in:
Dan Winship 2014-05-19 09:56:29 -04:00
parent e3221e6a12
commit 6661531062

View file

@ -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