diff options
| author | Dan Winship <danw@gnome.org> | 2014-05-19 09:56:29 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-05-19 09:58:11 -0400 |
| commit | 66615310624a310b6ec5c124afc14554739796fa (patch) | |
| tree | bec7e3a81b48c8bfb3c6863680ba45c2c1bdf4f2 | |
| parent | e3221e6a1243abd59dfa6952f8ed599fbe2bf111 (diff) | |
| download | NetworkManager-66615310624a310b6ec5c124afc14554739796fa.tar.gz | |
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.
| -rw-r--r-- | src/devices/nm-device.c | 9 |
1 files 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 |