From 6b31828f1890cdfd5d9a9700640f1dcb80961e9c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 15 Dec 2011 13:36:29 -0600 Subject: [PATCH] core: handle N900 USB network interface again 839c7909 made NM ignore this interface based on faulty information about what the interface did. It's actually just a normal network interface that the N900 can use to talk to the host or whatever. It's a bit annoying that for the most part it won't be used and that NM will keep attempting to connect it with DHCP unless the user changes the connection to be static IP (N900 defaults to address 192.168.2.15 and expects the computer to be 192.168.2.14 and requires an ifup in it's Xterm app) but if you have an N900 you're probably more knowledgable than most. http://wiki.maemo.org/N900_USB_networking --- src/nm-udev-manager.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c index 3ea447de1b..2e250e8625 100644 --- a/src/nm-udev-manager.c +++ b/src/nm-udev-manager.c @@ -530,18 +530,6 @@ net_add (NMUdevManager *self, GUdevDevice *device) return; } - /* Ignore Nokia cdc-ether interfaces in PC-Suite mode since we need to - * talk phonet to use them, which ModemManager doesn't do yet. - */ - tmp = g_udev_device_get_property (device, "ID_VENDOR_ID"); - if (g_strcmp0 (tmp, "0421") == 0) { /* Nokia vendor ID */ - tmp = g_udev_device_get_property (device, "ID_MODEL"); - if (tmp && (strstr (tmp, "PC-Suite") || strstr (tmp, "PC Suite"))) { - nm_log_dbg (LOGD_HW, "(%s): ignoring Nokia PC-Suite ethernet interface", iface); - return; - } - } - g_signal_emit (self, signals[DEVICE_ADDED], 0, device, device_creator); }