colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device: remove duplicate setting of device's driver property

Browse Source 
Fixes: 4dbaac4ba2
(cherry picked from commit 59f37f31d9)
This commit is contained in:
Thomas Haller
2017-01-20 16:47:21 +01:00
parent 0fd3ec81fd
commit 3b69a05fa0
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/devices/nm-device.c
View File

@@ -2140,8 +2140,7 @@ device_link_changed (NMDevice *self)
_notify (self, PROP_UDI); _notify (self, PROP_UDI);
} }
if (g_strcmp0 (info.driver, priv->driver)) { if (!nm_streq0 (info.driver, priv->driver)) {
/* Update driver to what udev gives us */
g_free (priv->driver); g_free (priv->driver);
priv->driver = g_strdup (info.driver); priv->driver = g_strdup (info.driver);
_notify (self, PROP_DRIVER); _notify (self, PROP_DRIVER);
@@ -2152,12 +2151,6 @@ device_link_changed (NMDevice *self)
_notify (self, PROP_MTU); _notify (self, PROP_MTU);
} }
if (info.driver && g_strcmp0 (priv->driver, info.driver) != 0) {
g_free (priv->driver);
priv->driver = g_strdup (info.driver);
_notify (self, PROP_DRIVER);
}
if (ifindex == nm_device_get_ip_ifindex (self)) if (ifindex == nm_device_get_ip_ifindex (self))
_stats_update_counters_from_pllink (self, &info); _stats_update_counters_from_pllink (self, &info);