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

Commit 68d8318b authored by Andrew Bird (Sphere Systems)'s avatar Andrew Bird (Sphere Systems) Committed by David S. Miller
Browse files

net: cdc_ether: Add ZTE WWAN matches before generic Ethernet 



Some ZTE WWAN devices have generic CDC Ether descriptors. Add those
into the whitelist so that we get FLAG_WWAN on the interface

Signed-off-by: default avatarAndrew Bird <ajb@spheresystems.co.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ec16439e

drivers/net/usb/cdc_ether.c

+56 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ static const struct driver_info wwan_info = { 


#define HUAWEI_VENDOR_ID	0x12D1

#define NOVATEL_VENDOR_ID	0x1410

#define ZTE_VENDOR_ID		0x19D2



static const struct usb_device_id	products [] = {

/*
@@ -617,6 +618,61 @@ static const struct usb_device_id products [] = { 
	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE,

	.driver_info = (unsigned long)&wwan_info,

}, {

	/* ZTE (Vodafone) K3805-Z */

	.match_flags    =   USB_DEVICE_ID_MATCH_VENDOR

		 | USB_DEVICE_ID_MATCH_PRODUCT

		 | USB_DEVICE_ID_MATCH_INT_INFO,

	.idVendor               = ZTE_VENDOR_ID,

	.idProduct		= 0x1003,

	.bInterfaceClass	= USB_CLASS_COMM,

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE,

	.driver_info = (unsigned long)&wwan_info,

}, {

	/* ZTE (Vodafone) K3806-Z */

	.match_flags    =   USB_DEVICE_ID_MATCH_VENDOR

		 | USB_DEVICE_ID_MATCH_PRODUCT

		 | USB_DEVICE_ID_MATCH_INT_INFO,

	.idVendor               = ZTE_VENDOR_ID,

	.idProduct		= 0x1015,

	.bInterfaceClass	= USB_CLASS_COMM,

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE,

	.driver_info = (unsigned long)&wwan_info,

}, {

	/* ZTE (Vodafone) K4510-Z */

	.match_flags    =   USB_DEVICE_ID_MATCH_VENDOR

		 | USB_DEVICE_ID_MATCH_PRODUCT

		 | USB_DEVICE_ID_MATCH_INT_INFO,

	.idVendor               = ZTE_VENDOR_ID,

	.idProduct		= 0x1173,

	.bInterfaceClass	= USB_CLASS_COMM,

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE,

	.driver_info = (unsigned long)&wwan_info,

}, {

	/* ZTE (Vodafone) K3770-Z */

	.match_flags    =   USB_DEVICE_ID_MATCH_VENDOR

		 | USB_DEVICE_ID_MATCH_PRODUCT

		 | USB_DEVICE_ID_MATCH_INT_INFO,

	.idVendor               = ZTE_VENDOR_ID,

	.idProduct		= 0x1177,

	.bInterfaceClass	= USB_CLASS_COMM,

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE,

	.driver_info = (unsigned long)&wwan_info,

}, {

	/* ZTE (Vodafone) K3772-Z */

	.match_flags    =   USB_DEVICE_ID_MATCH_VENDOR

		 | USB_DEVICE_ID_MATCH_PRODUCT

		 | USB_DEVICE_ID_MATCH_INT_INFO,

	.idVendor               = ZTE_VENDOR_ID,

	.idProduct		= 0x1181,

	.bInterfaceClass	= USB_CLASS_COMM,

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE,

	.driver_info = (unsigned long)&wwan_info,

}, {

	USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET,

			USB_CDC_PROTO_NONE),