fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-07 23:00:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: fix updating device information after link change

Browse source 
device_link_changed() can't use nm_device_update_from_platform_link()
to update the device private fields because the latter overwrites
priv->iface and priv->up, and so the checks below as:

  if (info.name[0] && strcmp (priv->iface, info.name) != 0) {

and:

  was_up = priv->up;
  priv->up = NM_FLAGS_HAS (info.n_ifi_flags, IFF_UP);
  ...
  if (priv->up && !was_up) {

never succeed.

Fixes: d7f7725ae8
(cherry picked from commit 46ed756112)
This commit is contained in:
Beniamino Galvani 2018-09-25 09:51:06 +02:00
parent 0b1ffdbdb5
commit 81aaf0ff93
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/devices/nm-device.c
View file

@ -3578,6 +3578,7 @@ device_link_changed (NMDevice *self)
gboolean ip_ifname_changed = FALSE;
nm_auto_nmpobj const NMPObject *pllink_keep_alive = NULL;
const NMPlatformLink *pllink;
const char *str;
int ifindex;
gboolean was_up;
gboolean update_unmanaged_specs = FALSE;
@ -3592,7 +3593,23 @@ device_link_changed (NMDevice *self)
pllink_keep_alive = nmp_object_ref (NMP_OBJECT_UP_CAST (pllink));
nm_device_update_from_platform_link (self, pllink);
str = nm_platform_link_get_udi (nm_device_get_platform (self), pllink->ifindex);
if (!nm_streq0 (str, priv->udi)) {
g_free (priv->udi);
priv->udi = g_strdup (str);
_notify (self, PROP_UDI);
}
if (!nm_streq0 (pllink->driver, priv->driver)) {
g_free (priv->driver);
priv->driver = g_strdup (pllink->driver);
_notify (self, PROP_DRIVER);
}
_set_mtu (self, pllink->mtu);
if (ifindex == nm_device_get_ip_ifindex (self))
_stats_update_counters_from_pllink (self, pllink);
had_hw_addr = (priv->hw_addr != NULL);
nm_device_update_hw_address (self);