--- drivers/net/wireless/p54/p54usb.c

+++ drivers/net/wireless/p54/p54usb.c

@@ -32,10 +32,21 @@ MODULE_ALIAS("prism54usb");

MODULE_FIRMWARE("isl3886usb");

MODULE_FIRMWARE("isl3887usb");

+/*

+ * Note:

+ *

+ * Always update our wiki's device list (located at:

+ * http://wireless.kernel.org/en/users/Drivers/p54/devices ),

+ * whenever you add a new device.

+ */

+

static struct usb_device_id p54u_table[] __devinitdata = {

/* Version 1 devices (pci chip + net2280) */

+ {USB_DEVICE(0x0411, 0x0050)}, /* Buffalo WLI2-USB2-G54 */

+ {USB_DEVICE(0x045e, 0x00c2)}, /* Microsoft MN-710 */

{USB_DEVICE(0x0506, 0x0a11)}, /* 3COM 3CRWE254G72 */

{USB_DEVICE(0x0707, 0xee06)}, /* SMC 2862W-G */

+ {USB_DEVICE(0x07aa, 0x001c)}, /* Corega CG-WLUSB2GT */

{USB_DEVICE(0x083a, 0x4501)}, /* Accton 802.11g WN4501 USB */

{USB_DEVICE(0x083a, 0x4502)}, /* Siemens Gigaset USB Adapter */

{USB_DEVICE(0x083a, 0x5501)}, /* Phillips CPWUA054 */

@@ -43,12 +54,20 @@ static struct usb_device_id p54u_table[]

{USB_DEVICE(0x0846, 0x4210)}, /* Netgear WG121 the second ? */

{USB_DEVICE(0x0846, 0x4220)}, /* Netgear WG111 */

{USB_DEVICE(0x09aa, 0x1000)}, /* Spinnaker Proto board */

+ {USB_DEVICE(0x0bf8, 0x1007)}, /* Fujitsu E-5400 USB */

{USB_DEVICE(0x0cde, 0x0006)}, /* Medion 40900, Roper Europe */

+ {USB_DEVICE(0x0db0, 0x6826)}, /* MSI UB54G (MS-6826) */

+ {USB_DEVICE(0x107b, 0x55f2)}, /* Gateway WGU-210 (Gemtek) */

{USB_DEVICE(0x124a, 0x4023)}, /* Shuttle PN15, Airvast WM168g, IOGear GWU513 */

+ {USB_DEVICE(0x1435, 0x0210)}, /* Inventel UR054G */

+ {USB_DEVICE(0x15a9, 0x0002)}, /* Gemtek WUBI-100GW 802.11g */

+ {USB_DEVICE(0x1630, 0x0005)}, /* 2Wire 802.11g USB (v1) / Z-Com */

+ {USB_DEVICE(0x182d, 0x096b)}, /* Sitecom WL-107 */

{USB_DEVICE(0x1915, 0x2234)}, /* Linksys WUSB54G OEM */

{USB_DEVICE(0x1915, 0x2235)}, /* Linksys WUSB54G Portable OEM */

{USB_DEVICE(0x2001, 0x3701)}, /* DLink DWL-G120 Spinnaker */

{USB_DEVICE(0x2001, 0x3703)}, /* DLink DWL-G122 */

+ {USB_DEVICE(0x2001, 0x3762)}, /* Conceptronic C54U */

{USB_DEVICE(0x5041, 0x2234)}, /* Linksys WUSB54G */

{USB_DEVICE(0x5041, 0x2235)}, /* Linksys WUSB54G Portable */

@@ -57,9 +76,11 @@ static struct usb_device_id p54u_table[]

{USB_DEVICE(0x050d, 0x7050)}, /* Belkin F5D7050 ver 1000 */

{USB_DEVICE(0x0572, 0x2000)}, /* Cohiba Proto board */

{USB_DEVICE(0x0572, 0x2002)}, /* Cohiba Proto board */

+ {USB_DEVICE(0x06a9, 0x000e)}, /* Westell 802.11g USB (A90-211WG-01) */

{USB_DEVICE(0x06b9, 0x0121)}, /* Thomson SpeedTouch 121g */

{USB_DEVICE(0x0707, 0xee13)}, /* SMC 2862W-G version 2 */

{USB_DEVICE(0x083a, 0x4521)}, /* Siemens Gigaset USB Adapter 54 version 2 */

+ {USB_DEVICE(0x083a, 0xf503)}, /* Accton FD7050E ver 1010ec */

{USB_DEVICE(0x0846, 0x4240)}, /* Netgear WG111 (v2) */

{USB_DEVICE(0x0915, 0x2000)}, /* Cohiba Proto board */

{USB_DEVICE(0x0915, 0x2002)}, /* Cohiba Proto board */

@@ -75,7 +96,11 @@ static struct usb_device_id p54u_table[]

{USB_DEVICE(0x13B1, 0x000C)}, /* Linksys WUSB54AG */

{USB_DEVICE(0x1413, 0x5400)}, /* Telsey 802.11g USB2.0 Adapter */

{USB_DEVICE(0x1435, 0x0427)}, /* Inventel UR054G */

+ {USB_DEVICE(0x1668, 0x1050)}, /* Actiontec 802UIG-1 */

+ {USB_DEVICE(0x1740, 0x1000)}, /* Senao NUB-350 */

{USB_DEVICE(0x2001, 0x3704)}, /* DLink DWL-G122 rev A2 */

+ {USB_DEVICE(0x2001, 0x3705)}, /* D-Link DWL-G120 rev C1 */

+ {USB_DEVICE(0x413c, 0x5513)}, /* Dell WLA3310 USB Wireless Adapter */

{USB_DEVICE(0x413c, 0x8102)}, /* Spinnaker DUT */

{USB_DEVICE(0x413c, 0x8104)}, /* Cohiba Proto board */

{}

@@ -926,8 +951,8 @@ static int __devinit p54u_probe(struct u

#ifdef CONFIG_PM

/* ISL3887 needs a full reset on resume */

udev->reset_resume = 1;

+#endif /* CONFIG_PM */

err = p54u_device_reset(dev);

-#endif

priv->hw_type = P54U_3887;

dev->extra_tx_headroom += sizeof(struct lm87_tx_hdr);