fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 16:20:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: fix enumeration of devices at startup to use udev after 2fe8019a

Browse source 
nm_platform_query_devices() was just looking in the link_cache,
completely ignoring udev, which means that the link list wasn't
filtered for things NM wants to ignore.
This commit is contained in:
Dan Williams 2013-06-06 11:41:30 -05:00
parent 10c94acbb7
commit bc60d37050
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/platform/nm-linux-platform.c
View file

@ -1039,8 +1039,12 @@ link_get_all (NMPlatform *platform)
struct nl_object *object;
for (object = nl_cache_get_first (priv->link_cache); object; object = nl_cache_get_next (object)) {
link_init (platform, &device, (struct rtnl_link *) object);
g_array_append_val (links, device);
int ifindex = rtnl_link_get_ifindex ((struct rtnl_link *) object);
if (g_hash_table_lookup (priv->udev_devices, GINT_TO_POINTER (ifindex))) {
link_init (platform, &device, (struct rtnl_link *) object);
g_array_append_val (links, device);
}
}
return links;
@ -2326,15 +2330,7 @@ setup (NMPlatform *platform)
devices = g_udev_enumerator_execute (enumerator);
for (iter = devices; iter; iter = g_list_next (iter)) {
GUdevDevice *udev_device = iter->data;
if (g_udev_device_get_sysfs_attr (udev_device, "ifindex")) {
int ifindex = g_udev_device_get_sysfs_attr_as_int (udev_device, "ifindex");
g_hash_table_insert (priv->udev_devices, GINT_TO_POINTER (ifindex),
g_object_ref (udev_device));
}
udev_device_added (platform, G_UDEV_DEVICE (iter->data));
g_object_unref (G_UDEV_DEVICE (iter->data));
}
g_list_free (devices);