Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b5939ba authored by Yegor Yefremov's avatar Yegor Yefremov Committed by David S. Miller
Browse files

qmi_wwan/cdc_ether: move Novatel E371 (1410:9011) to qmi_wwan 



This device provides QMI and ethernet functionality via a standard CDC
ethernet descriptor.  But when driven by cdc_ether, the QMI
functionality is unavailable because only cdc_ether can claim the USB
interface. Thus blacklist the device in cdc_ether and add its IDs to
qmi_wwan, which enables both QMI and ethernet simultaneously.

Signed-off-by: default avatarYegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fea1829f

drivers/net/usb/cdc_ether.c

+7 −0
Original line number Diff line number Diff line
@@ -625,6 +625,13 @@ static const struct usb_device_id products[] = { 
	.driver_info = 0,

},



/* Novatel Expedite E371 - handled by qmi_wwan */

{

	USB_DEVICE_AND_INTERFACE_INFO(NOVATEL_VENDOR_ID, 0x9011, USB_CLASS_COMM,

			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),

	.driver_info = 0,

},



/* AnyDATA ADU960S - handled by qmi_wwan */

{

	USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a, USB_CLASS_COMM,

drivers/net/usb/qmi_wwan.c

+7 −0
Original line number Diff line number Diff line
@@ -500,6 +500,13 @@ static const struct usb_device_id products[] = { 
		                              USB_CDC_PROTO_NONE),

		.driver_info        = (unsigned long)&qmi_wwan_info,

	},

	{	/* Novatel Expedite E371 */

		USB_DEVICE_AND_INTERFACE_INFO(0x1410, 0x9011,

		                              USB_CLASS_COMM,

		                              USB_CDC_SUBCLASS_ETHERNET,

		                              USB_CDC_PROTO_NONE),

		.driver_info        = (unsigned long)&qmi_wwan_info,

	},

	{	/* Dell Wireless 5800 (Novatel E362) */

		USB_DEVICE_AND_INTERFACE_INFO(0x413C, 0x8195,

					      USB_CLASS_COMM,