Revert change to ignore USB based Ethernet devices
authorMarcel Holtmann <marcel@holtmann.org>
Sun, 5 Jul 2009 17:09:58 +0000 (10:09 -0700)
committerMarcel Holtmann <marcel@holtmann.org>
Sun, 5 Jul 2009 17:09:58 +0000 (10:09 -0700)
src/inet.c

index 6105344..cfd0d77 100644 (file)
@@ -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;