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

core: ensure device is removed from the device list before signaling its removal

Browse source 
Might fix lp#319918
This commit is contained in:
Dan Williams 2009-03-31 13:10:00 -04:00
parent 7d22ae39b6
commit 13d1655cdd
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nm-manager.c
View file

@ -1457,8 +1457,7 @@ static void
sync_devices (NMManager *self)
{
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
GSList *devices = NULL;
GSList *iter;
GSList *keep = NULL, *gone = NULL, *iter;
/* Keep devices still known to HAL; get rid of ones HAL no longer knows about */
for (iter = priv->devices; iter; iter = iter->next) {
@ -1470,12 +1469,17 @@ sync_devices (NMManager *self)
nm_device_set_managed (device, TRUE, NM_DEVICE_STATE_REASON_NOW_MANAGED);
else
nm_device_set_managed (device, FALSE, NM_DEVICE_STATE_REASON_NOW_UNMANAGED);
devices = g_slist_prepend (devices, device);
keep = g_slist_append (keep, device);
} else
remove_one_device (self, device);
gone = g_slist_append (gone, device);
}
g_slist_free (priv->devices);
priv->devices = devices;
priv->devices = keep;
/* Dispose of devices no longer present */
for (iter = gone; iter; iter = g_slist_next (iter))
remove_one_device (self, NM_DEVICE (iter->data));
g_slist_free (gone);
/* Ask HAL for new devices */
nm_hal_manager_query_devices (priv->hal_mgr);