From dfc116f625aa2103775b479bf3c2272475b0108d Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 5 Jul 2009 10:09:58 -0700 Subject: Revert change to ignore USB based Ethernet devices --- src/inet.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/inet.c') 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; -- cgit v1.2.3