diff mbox

Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs

Message ID 910710.29413.qm@web52911.mail.re2.yahoo.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Chris Rankin Oct. 11, 2009, 1:57 p.m. UTC 
Hi,

I submitted this patch months ago and then forgot about it, but I've noticed that it hasn't been picked up so I've regenerated it against 2.6.31.

Short description:

The Belkin F8T012xx1 bluetooth adaptor has the same vendor and product
IDs as the Belkin F5D5050, so we need to teach the pegasus driver to
ignore adaptors belonging to the "Wireless" class 0xE0. For this one
case anyway, seeing as pegasus is a driver for "Wired" adaptors.

Cheers,
Chris

Comments

David Miller Oct. 13, 2009, 7:31 a.m. UTC | #1 
From: Chris Rankin <rankincj@yahoo.com>
Date: Sun, 11 Oct 2009 06:57:50 -0700 (PDT)

> I submitted this patch months ago and then forgot about it, but I've
> noticed that it hasn't been picked up so I've regenerated it against
> 2.6.31.
> 
> Short description:
> 
> The Belkin F8T012xx1 bluetooth adaptor has the same vendor and product
> IDs as the Belkin F5D5050, so we need to teach the pegasus driver to
> ignore adaptors belonging to the "Wireless" class 0xE0. For this one
> case anyway, seeing as pegasus is a driver for "Wired" adaptors.

Applied, but please put your Signed-off-by: here at the end
of your commit message rather than after the patch.

Putting it after the patch makes it more difficult for
automated tools to pick it up, thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- linux-2.6.31/drivers/net/usb/pegasus.h.orig	2009-10-05 20:49:34.000000000 +0100
+++ linux-2.6.31/drivers/net/usb/pegasus.h	2009-10-05 22:10:22.000000000 +0100
@@ -202,7 +202,11 @@ 
 		DEFAULT_GPIO_RESET | PEGASUS_II )
 PEGASUS_DEV( "Allied Telesyn Int. AT-USB100", VENDOR_ALLIEDTEL, 0xb100,
 		DEFAULT_GPIO_RESET | PEGASUS_II )
-PEGASUS_DEV( "Belkin F5D5050 USB Ethernet", VENDOR_BELKIN, 0x0121,
+/*
+ * Distinguish between this Belkin adaptor and the Belkin bluetooth adaptors
+ * with the same product IDs by checking the device class too.
+ */
+PEGASUS_DEV_CLASS( "Belkin F5D5050 USB Ethernet", VENDOR_BELKIN, 0x0121, 0x00,
 		DEFAULT_GPIO_RESET | PEGASUS_II )
 PEGASUS_DEV( "Billionton USB-100", VENDOR_BILLIONTON, 0x0986,
 		DEFAULT_GPIO_RESET )
--- linux-2.6.31/drivers/net/usb/pegasus.c.orig	2009-10-05 20:49:34.000000000 +0100
+++ linux-2.6.31/drivers/net/usb/pegasus.c	2009-10-05 22:14:59.000000000 +0100
@@ -62,8 +62,11 @@ 
 static struct usb_eth_dev usb_dev_id[] = {
 #define	PEGASUS_DEV(pn, vid, pid, flags)	\
 	{.name = pn, .vendor = vid, .device = pid, .private = flags},
+#define PEGASUS_DEV_CLASS(pn, vid, pid, dclass, flags) \
+	PEGASUS_DEV(pn, vid, pid, flags)
 #include "pegasus.h"
 #undef	PEGASUS_DEV
+#undef	PEGASUS_DEV_CLASS
 	{NULL, 0, 0, 0},
 	{NULL, 0, 0, 0}
 };
@@ -71,8 +74,18 @@ 
 static struct usb_device_id pegasus_ids[] = {
 #define	PEGASUS_DEV(pn, vid, pid, flags) \
 	{.match_flags = USB_DEVICE_ID_MATCH_DEVICE, .idVendor = vid, .idProduct = pid},
+/*
+ * The Belkin F8T012xx1 bluetooth adaptor has the same vendor and product
+ * IDs as the Belkin F5D5050, so we need to teach the pegasus driver to
+ * ignore adaptors belonging to the "Wireless" class 0xE0. For this one
+ * case anyway, seeing as the pegasus is for "Wired" adaptors.
+ */
+#define PEGASUS_DEV_CLASS(pn, vid, pid, dclass, flags) \
+	{.match_flags = (USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_DEV_CLASS), \
+	.idVendor = vid, .idProduct = pid, .bDeviceClass = dclass},
 #include "pegasus.h"
 #undef	PEGASUS_DEV
+#undef	PEGASUS_DEV_CLASS
 	{},
 	{}
 };

Signed-off-by: Chris Rankin <rankincj@yahoo.com>