Index: /usr/src/sys/dev/usb/net/if_cdce.c =================================================================== --- /usr/src/sys/dev/usb/net/if_cdce.c (revision 269431) +++ /usr/src/sys/dev/usb/net/if_cdce.c (working copy) @@ -277,6 +277,15 @@ {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLA300, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)}, {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC700, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)}, {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC750, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)}, + {USB_VENDOR(USB_VENDOR_HUAWEI), USB_IFACE_CLASS(UICLASS_VENDOR), + USB_IFACE_SUBCLASS(0x02), USB_IFACE_PROTOCOL(0x16), + USB_DRIVER_INFO(0)}, + {USB_VENDOR(USB_VENDOR_HUAWEI), USB_IFACE_CLASS(UICLASS_VENDOR), + USB_IFACE_SUBCLASS(0x02), USB_IFACE_PROTOCOL(0x46), + USB_DRIVER_INFO(0)}, + {USB_VENDOR(USB_VENDOR_HUAWEI), USB_IFACE_CLASS(UICLASS_VENDOR), + USB_IFACE_SUBCLASS(0x02), USB_IFACE_PROTOCOL(0x76), + USB_DRIVER_INFO(0)}, }; static const STRUCT_USB_DUAL_ID cdce_dual_devs[] = { Index: /usr/src/sys/dev/usb/serial/u3g.c =================================================================== --- /usr/src/sys/dev/usb/serial/u3g.c (revision 269431) +++ /usr/src/sys/dev/usb/serial/u3g.c (working copy) @@ -327,6 +319,8 @@ U3G_DEV(HUAWEI, K4505, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, K4505_INIT, U3GINIT_HUAWEISCSI), U3G_DEV(HUAWEI, ETS2055, U3GINIT_HUAWEI), + U3G_DEV(HUAWEI, E3272_INIT, U3GINIT_HUAWEISCSI), + U3G_DEV(HUAWEI, E3272, 0), U3G_DEV(KYOCERA2, CDMA_MSM_K, 0), U3G_DEV(KYOCERA2, KPC680, 0), U3G_DEV(LONGCHEER, WM66, U3GINIT_HUAWEI), @@ -607,6 +602,16 @@ return (0); } +/* Huawei specific: see if_cdce.c for more ids. */ +#define U3G_HUAWEI_IS_CDC(info, iface_descr) \ + ((info)->idVendor == USB_VENDOR_HUAWEI && \ + (iface_descr)->bInterfaceClass == UICLASS_VENDOR && \ + (iface_descr)->bInterfaceSubClass == 0x02 && \ + ((iface_descr)->bInterfaceProtocol == 0x16 || \ + (iface_descr)->bInterfaceProtocol == 0x46 || \ + (iface_descr)->bInterfaceProtocol == 0x76)) + + static void u3g_sael_m460_init(struct usb_device *udev) { @@ -814,6 +819,10 @@ if (uaa->info.bInterfaceClass != UICLASS_VENDOR) { return (ENXIO); } + /* Huawei specific: skip cdce devices. */ + if (U3G_HUAWEI_IS_CDC(&uaa->info, &uaa->info)) { + return (ENXIO); + } return (usbd_lookup_id_by_uaa(u3g_devs, sizeof(u3g_devs), uaa)); } @@ -857,6 +866,9 @@ id = usbd_get_interface_descriptor(iface); if (id == NULL || id->bInterfaceClass != UICLASS_VENDOR) continue; + /* Huawei specific: skip cdce devices. */ + if (U3G_HUAWEI_IS_CDC(&uaa->info, id)) + continue; usbd_set_parent_iface(uaa->device, i, uaa->info.bIfaceIndex); iface_valid |= (1<