summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2011-12-15 13:36:29 -0600
committerDan Williams <dcbw@redhat.com>2011-12-15 14:36:56 -0600
commitdee0f6d4c1dcc7cedaa2fe7f874623f891020811 (patch)
tree99375ed52552a495fef452ef339a9dbec3d8d679
parent955e863e123cdf91b9f359bb56762561cb6d4d90 (diff)
downloadNetworkManager-dee0f6d4c1dcc7cedaa2fe7f874623f891020811.tar.gz
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
-rw-r--r--src/nm-udev-manager.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c
index 260703dab9..1b44294597 100644
--- a/src/nm-udev-manager.c
+++ b/src/nm-udev-manager.c
@@ -447,18 +447,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, "ignoring Nokia PC-Suite ethernet interface");
- return;
- }
- }
-
g_signal_emit (self, signals[DEVICE_ADDED], 0, device, device_creator);
}