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

Commit b3c914aa authored by Dan Williams's avatar Dan Williams Committed by David S. Miller
Browse files

usbnet: add support for some Huawei modems with cdc-ether ports 



Some newer Huawei devices (T-Mobile Rocket, others) have cdc-ether
compatible ports, so recognize and expose them.

Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Acked-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8333a46a

drivers/net/usb/cdc_ether.c

+12 −2
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static const struct driver_info cdc_info = { 
	.manage_power =	cdc_manage_power,

};



static const struct driver_info mbm_info = {

static const struct driver_info wwan_info = {

	.description =	"Mobile Broadband Network Device",

	.flags =	FLAG_WWAN,

	.bind =		usbnet_cdc_bind,
@@ -471,6 +471,7 @@ static const struct driver_info mbm_info = { 


/*-------------------------------------------------------------------------*/



#define HUAWEI_VENDOR_ID	0x12D1



static const struct usb_device_id	products [] = {

/*
@@ -587,8 +588,17 @@ static const struct usb_device_id products [] = { 
}, {

	USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MDLM,

			USB_CDC_PROTO_NONE),

	.driver_info = (unsigned long)&mbm_info,

	.driver_info = (unsigned long)&wwan_info,



}, {

	/* Various Huawei modems with a network port like the UMG1831 */

	.match_flags    =   USB_DEVICE_ID_MATCH_VENDOR

		 | USB_DEVICE_ID_MATCH_INT_INFO,

	.idVendor               = HUAWEI_VENDOR_ID,

	.bInterfaceClass	= USB_CLASS_COMM,

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET,

	.bInterfaceProtocol	= 255,

	.driver_info = (unsigned long)&wwan_info,

},

	{ },		// END

};