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

Commit 49a4536a authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

USB: zaurus: support another broken Zaurus 



commit 6605cc67ca18b9d583eb96e18a20f5f4e726103c upstream.

This SL-6000 says Direct Line, not Ethernet

v2: added Reporter and Link

Signed-off-by: default avatarOliver Neukum <oneukum@suse.com>
Reported-by: default avatarRoss Maynard <bids.7405@bigpond.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=215361


Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b95d71ab

drivers/net/usb/cdc_ether.c

+12 −0
Original line number Diff line number Diff line
@@ -571,6 +571,11 @@ static const struct usb_device_id products[] = { 
	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET, \

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE



#define ZAURUS_FAKE_INTERFACE \

	.bInterfaceClass	= USB_CLASS_COMM, \

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_MDLM, \

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE



/* SA-1100 based Sharp Zaurus ("collie"), or compatible;

 * wire-incompatible with true CDC Ethernet implementations.

 * (And, it seems, needlessly so...)
@@ -624,6 +629,13 @@ static const struct usb_device_id products[] = { 
	.idProduct              = 0x9032,	/* SL-6000 */

	ZAURUS_MASTER_INTERFACE,

	.driver_info		= 0,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

		 | USB_DEVICE_ID_MATCH_DEVICE,

	.idVendor               = 0x04DD,

	.idProduct              = 0x9032,	/* SL-6000 */

	ZAURUS_FAKE_INTERFACE,

	.driver_info		= 0,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

		 | USB_DEVICE_ID_MATCH_DEVICE,

drivers/net/usb/zaurus.c

+12 −0
Original line number Diff line number Diff line
@@ -256,6 +256,11 @@ static const struct usb_device_id products [] = { 
	.bInterfaceSubClass	= USB_CDC_SUBCLASS_ETHERNET, \

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE



#define ZAURUS_FAKE_INTERFACE \

	.bInterfaceClass	= USB_CLASS_COMM, \

	.bInterfaceSubClass	= USB_CDC_SUBCLASS_MDLM, \

	.bInterfaceProtocol	= USB_CDC_PROTO_NONE



/* SA-1100 based Sharp Zaurus ("collie"), or compatible. */

{

	.match_flags	=   USB_DEVICE_ID_MATCH_INT_INFO
@@ -313,6 +318,13 @@ static const struct usb_device_id products [] = { 
	.idProduct              = 0x9032,	/* SL-6000 */

	ZAURUS_MASTER_INTERFACE,

	.driver_info = ZAURUS_PXA_INFO,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

			    | USB_DEVICE_ID_MATCH_DEVICE,

	.idVendor		= 0x04DD,

	.idProduct		= 0x9032,	/* SL-6000 */

	ZAURUS_FAKE_INTERFACE,

	.driver_info = (unsigned long)&bogus_mdlm_info,

}, {

	.match_flags    =   USB_DEVICE_ID_MATCH_INT_INFO

		 | USB_DEVICE_ID_MATCH_DEVICE,