| From 1f3f687722fd9b29a0c2a85b4844e3b2a3585c63 Mon Sep 17 00:00:00 2001 |
| From: Bjørn Mork <bjorn@mork.no> |
| Date: Wed, 13 Feb 2013 23:41:34 +0100 |
| Subject: USB: option: add Huawei "ACM" devices using protocol = vendor |
| |
| From: Bjørn Mork <bjorn@mork.no> |
| |
| commit 1f3f687722fd9b29a0c2a85b4844e3b2a3585c63 upstream. |
| |
| The USB device descriptor of one identity presented by a few |
| Huawei morphing devices have serial functions with class codes |
| 02/02/ff, indicating CDC ACM with a vendor specific protocol. This |
| combination is often used for MSFT RNDIS functions, and the CDC |
| ACM class driver will therefore ignore such functions. |
| |
| The CDC ACM class driver cannot support functions with only 2 |
| endpoints. The underlying serial functions of these modems are |
| also believed to be the same as for alternate device identities |
| already supported by the option driver. Letting the same driver |
| handle these functions independently of the current identity |
| ensures consistent handling and user experience. |
| |
| There is no need to blacklist these devices in the rndis_host |
| driver. Huawei serial functions will either have only 2 endpoints |
| or a CDC ACM functional descriptor with bmCapabilities != 0, making |
| them correctly ignored as "non RNDIS" by that driver. |
| |
| Signed-off-by: Bjørn Mork <bjorn@mork.no> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/serial/option.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/drivers/usb/serial/option.c |
| +++ b/drivers/usb/serial/option.c |
| @@ -578,8 +578,12 @@ static const struct usb_device_id option |
| { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, |
| { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), |
| .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, |
| + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c05, USB_CLASS_COMM, 0x02, 0xff) }, |
| + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) }, |
| { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), |
| .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, |
| + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) }, |
| + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1442, USB_CLASS_COMM, 0x02, 0xff) }, |
| { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff), |
| .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, |
| { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff), |
