2008-03-11 Tambet Ingo <tambet@gmail.com>

* src/nm-hal-manager.c (create_device_and_add_to_list): Don't ignore USB devices.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3421 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo 2008-03-11 17:36:28 +00:00
parent c39a038acd
commit 48f6638f3d
2 changed files with 5 additions and 10 deletions

View file

@ -1,3 +1,7 @@
2008-03-11 Tambet Ingo <tambet@gmail.com>
* src/nm-hal-manager.c (create_device_and_add_to_list): Don't ignore USB devices.
2008-03-11 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerPolicy.c

View file

@ -292,21 +292,12 @@ create_device_and_add_to_list (NMHalManager *manager,
DeviceCreator *creator,
const char *udi)
{
NMDevice *dev = NULL;
char *usb_test = NULL;
NMDevice *dev;
/* Make sure the device is not already in the device list */
if ((dev = nm_manager_get_device_by_udi (manager->nm_manager, udi)))
return NULL;
/* Ignore Ethernet-over-USB devices too for the moment (Red Hat #135722) */
if (libhal_device_property_exists (manager->hal_ctx, udi, "usb.interface.class", NULL)
&& (usb_test = libhal_device_get_property_string (manager->hal_ctx, udi, "usb.interface.class", NULL))) {
libhal_free_string (usb_test);
return NULL;
}
dev = creator->creator_fn (manager, udi);
if (dev) {
nm_info ("Now managing %s device '%s'.",