From 0c8d8b4da38e2de9e5ab4b07128924872923ca8b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 5 Aug 2013 16:39:20 -0500 Subject: core: update UDI when it's available Software devices don't have a UDI until udev finds them, and since we need to know about the software devices before udev finds them the UDI will be missing. Instead of requiring a UDI on NMDevice creation, update the property from the NMPlatform link change signal when udev does find the device. Now that a UDI is no longer required for device creation, software devices added by NM would be created in the platform_link_added_cb() signal handler triggered by the various software device creation methods in system_create_virtual_device() (eg nm_platform_bridge_add() etc). Then the NMDevice created in system_create_virtual_device() would be a duplicate and cause problems when it was added. Since system_create_virtual_device() needs to do setup on some devices, suppress the device creation from the platform link added handler in this function. Much of this is a hack which should be cleaned up later. --- src/devices/nm-device-infiniband.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/devices/nm-device-infiniband.h') diff --git a/src/devices/nm-device-infiniband.h b/src/devices/nm-device-infiniband.h index 4a68b6c1d9..7ea1336860 100644 --- a/src/devices/nm-device-infiniband.h +++ b/src/devices/nm-device-infiniband.h @@ -53,8 +53,7 @@ typedef struct { GType nm_device_infiniband_get_type (void); NMDevice *nm_device_infiniband_new (NMPlatformLink *platform_device); -NMDevice *nm_device_infiniband_new_partition (const char *udi, - const char *iface, +NMDevice *nm_device_infiniband_new_partition (const char *iface, const char *driver); G_END_DECLS -- cgit v1.2.1