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

core: merge branch 'bg/rh1542366'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1542366
(cherry picked from commit c7c989804f)
This commit is contained in:
Beniamino Galvani 2018-09-05 17:19:15 +02:00
commit a0b4aff370
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4236,6 +4236,9 @@ nm_device_unrealize (NMDevice *self, gboolean remove_resources, GError **error)
}
}
nm_clear_g_source (&priv->queued_ip_config_id_4);
nm_clear_g_source (&priv->queued_ip_config_id_6);
g_object_freeze_notify (G_OBJECT (self));
NM_DEVICE_GET_CLASS (self)->unrealize_notify (self);

18
src/nm-manager.c
View file

@ -3008,10 +3008,21 @@ platform_link_added (NMManager *self,
continue;
if (nm_device_is_real (candidate)) {
/* Ignore the link added event since there's already a realized
* device with the link's name.
/* There's already a realized device with the link's name
* and a different ifindex.
*/
nm_device_update_from_platform_link (candidate, plink);
if (nm_device_get_ifindex (candidate) <= 0)
nm_device_update_from_platform_link (candidate, plink);
else {
/* The ifindex of a device can't be changed after
* initialization because it is used as a key by
* the dns-manager.
*/
_LOGD (LOGD_DEVICE, "(%s): removing old device %p after ifindex change from %d to %d",
plink->name, candidate, nm_device_get_ifindex (candidate), ifindex);
remove_device (self, candidate, FALSE, TRUE);
goto add;
}
return;
} else if (nm_device_realize_start (candidate,
plink,
@ -3031,6 +3042,7 @@ platform_link_added (NMManager *self,
/* Try next unrealized device */
}
add:
/* Try registered device factories */
factory = nm_device_factory_manager_find_factory_for_link_type (plink->type);
if (factory) {