diff --git a/src/nm-manager.c b/src/nm-manager.c index 15e1c80e6a..a6bac553b2 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1160,29 +1160,6 @@ nm_manager_get_device_by_udi (NMManager *manager, const char *udi) return NULL; } -static NMDevice * -nm_manager_get_device_by_originating_device (NMManager *manager, const char *od) -{ - GSList *iter; - - for (iter = NM_MANAGER_GET_PRIVATE (manager)->devices; iter; iter = iter->next) { - const char *candidate_od = g_object_get_data (G_OBJECT (iter->data), ORIGDEV_TAG); - - if (candidate_od && !strcmp (candidate_od, od)) - return NM_DEVICE (iter->data); - } - return NULL; -} - -static void -nm_manager_set_originating_device (NMDevice *device, const char *originating_device) -{ - g_return_if_fail (device != NULL); - g_return_if_fail (originating_device != NULL); - - g_object_set_data_full (G_OBJECT (device), ORIGDEV_TAG, g_strdup (originating_device), g_free); -} - static gboolean nm_manager_udi_is_managed (NMManager *self, const char *udi) { @@ -1692,18 +1669,10 @@ hal_manager_udi_added_cb (NMHalManager *hal_mgr, if (nm_manager_get_device_by_udi (self, udi)) return; - /* Only ignore multiple ports for serial devices */ - if (general_type == NM_TYPE_SERIAL_DEVICE) { - if (nm_manager_get_device_by_originating_device (self, originating_device)) - return; - } - device = creator_fn (hal_mgr, udi, originating_device, nm_manager_udi_is_managed (self, udi)); if (!device) return; - nm_manager_set_originating_device (NM_DEVICE (device), originating_device); - priv->devices = g_slist_append (priv->devices, device); g_signal_connect (device, "state-changed",