summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-07-05 10:09:58 -0700
committerMarcel Holtmann <marcel@holtmann.org>2009-07-05 10:09:58 -0700
commitdfc116f625aa2103775b479bf3c2272475b0108d (patch)
tree510975dfa9e5e3c1df4ab4ac65543ae916cf26dc
parent213033c085063b081fd9fdd0c26752dc5ca6bbd4 (diff)
downloadconnman-dfc116f625aa2103775b479bf3c2272475b0108d.tar.gz
connman-dfc116f625aa2103775b479bf3c2272475b0108d.tar.bz2
connman-dfc116f625aa2103775b479bf3c2272475b0108d.zip
Revert change to ignore USB based Ethernet devices
-rw-r--r--src/inet.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/inet.c b/src/inet.c
index 6105344c..cfd0d774 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -321,14 +321,13 @@ enum connman_device_type __connman_inet_get_device_type(int index)
memset(&iwr, 0, sizeof(iwr));
strncpy(iwr.ifr_ifrn.ifrn_name, devname, IFNAMSIZ);
- if (g_str_has_prefix(devname, "vmnet") == TRUE ||
- g_str_has_prefix(ifr.ifr_name, "vboxnet") == TRUE) {
+ if (g_str_has_prefix(devname, "vmnet") == TRUE)
devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;
- } else if (g_str_has_prefix(devname, "bnep") == TRUE)
+ else if (g_str_has_prefix(ifr.ifr_name, "vboxnet") == TRUE)
devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;
- else if (g_str_has_prefix(devname, "wmx") == TRUE)
+ else if (g_str_has_prefix(devname, "bnep") == TRUE)
devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;
- else if (g_str_has_prefix(devname, "usb") == TRUE)
+ else if (g_str_has_prefix(devname, "wmx") == TRUE)
devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;
else if (stat(wimax_path, &st) == 0 && (st.st_mode & S_IFDIR))
devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;