regen

2 files changed, 287 insertions, 26 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index ad6c0057b81..2b4f9199934 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.140 2005/03/05 14:12:59 itojun Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.141 2005/03/08 09:53:45 dlg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.136 2005/03/05 14:12:46 itojun Exp 
+ *	OpenBSD: usbdevs,v 1.137 2005/03/08 09:53:21 dlg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -200,6 +200,7 @@
 #define	USB_VENDOR_MICROTEK	0x05da		/* Microtek */
 #define	USB_VENDOR_SUNTAC	0x05db		/* SUN Corporation */
 #define	USB_VENDOR_LEXAR	0x05dc		/* Lexar Media */
+#define	USB_VENDOR_ADDTRON	0x05dd		/* Addtron */
 #define	USB_VENDOR_SYMBOL	0x05e0		/* Symbol Technologies */
 #define	USB_VENDOR_GENESYS	0x05e3		/* Genesys Logic */
 #define	USB_VENDOR_FUJI	0x05e5		/* Fuji Electric */
@@ -232,6 +233,7 @@
 #define	USB_VENDOR_PROLIFIC	0x067b		/* Prolific Technology */
 #define	USB_VENDOR_SIEMENS	0x067c		/* Siemens */
 #define	USB_VENDOR_AVANCELOGIC	0x0680		/* Avance Logic */
+#define	USB_VENDOR_SIEMENS2	0x0681		/* Siemens */
 #define	USB_VENDOR_MINOLTA	0x0686		/* Minolta */
 #define	USB_VENDOR_CHPRODUCTS	0x068e		/* CH Products */
 #define	USB_VENDOR_HAGIWARA	0x0693		/* Hagiwara Sys-Com */
@@ -371,11 +373,13 @@
 #define	USB_VENDOR_DMI	0x0c0b		/* DMI */
 #define	USB_VENDOR_EASYDISK	0x0c76		/* EasyDisk */
 #define	USB_VENDOR_ZCOM	0x0cde		/* Z-Com */
-#define	USB_VENDOR_ELCON	0x0db7		/* ELCON Systemtechnik */
 #define	USB_VENDOR_TANGTOP	0x0d3d		/* Tangtop */
+#define	USB_VENDOR_SMC3	0x0d5c		/* SMC */
 #define	USB_VENDOR_PEN	0x0d7d		/* Pen Drive */
 #define	USB_VENDOR_ABC	0x0d8c		/* ABC */
+#define	USB_VENDOR_CONCEPTRONIC	0x0d8e		/* Conceptronic */
 #define	USB_VENDOR_MSI	0x0db0		/* Micro Star International */
+#define	USB_VENDOR_ELCON	0x0db7		/* ELCON Systemtechnik */
 #define	USB_VENDOR_HAWKING	0x0e66		/* Hawking */
 #define	USB_VENDOR_OTI	0x0ea0		/* Ours Technology Inc. */
 #define	USB_VENDOR_PILOTECH	0x0eaf		/* Pilotech */
@@ -394,6 +398,7 @@
 #define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components */
 #define	USB_VENDOR_AINCOMM	0x12fd		/* Aincomm */
 #define	USB_VENDOR_MOBILITY	0x1342		/* Mobility */
+#define	USB_VENDOR_DICKSMITH	0x1371		/* Dick Smith Electronics */
 #define	USB_VENDOR_SHARK	0x13d2		/* Shark */
 #define	USB_VENDOR_SILICOM	0x1485		/* Silicom */
 #define	USB_VENDOR_SILICONPORTALS	0x1527		/* Silicon Portals */
@@ -403,8 +408,10 @@
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics */
+#define	USB_VENDOR_GIGASET	0x1690		/* Gigaset */
 #define	USB_VENDOR_LINKSYS3	0x1915		/* Linksys */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link */
+#define	USB_VENDOR_PLANEX2	0x2019		/* Planex Communications */
 #define	USB_VENDOR_MOTOROLA2	0x22b8		/* Motorola */
 #define	USB_VENDOR_TRIPPLITE	0x2478		/* Tripp-Lite */
 #define	USB_VENDOR_NHJ	0x2770		/* NHJ */
@@ -432,7 +439,8 @@
 /* 3Com products */
 #define	USB_PRODUCT_3COM_HOMECONN	0x009d		/* HomeConnect */
 #define	USB_PRODUCT_3COM_3CREB96	0x00a0		/* Bluetooth */
-#define	USB_PRODUCT_3COM_3C19250	0x03E8		/* 3C19250 Ethernet */
+#define	USB_PRODUCT_3COM_3C19250	0x03e8		/* 3C19250 Ethernet */
+#define	USB_PRODUCT_3COM_3CRSHEW696	0x0a01		/* 3CRSHEW696 */
 #define	USB_PRODUCT_3COM_3C460	0x11f8		/* HomeConnect 3C460 */
 #define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 */
 #define	USB_PRODUCT_3COM_3C460B	0x4601		/* HomeConnect 3C460B */
@@ -456,6 +464,7 @@
 #define	USB_PRODUCT_ABOCOM_XX8	0x4102		/* XX8 */
 #define	USB_PRODUCT_ABOCOM_XX9	0x4104		/* XX9 */
 #define	USB_PRODUCT_ABOCOM_XX10	0xabc1		/* XX10 */
+#define	USB_PRODUCT_ABOCOM_BWU613	0xb000		/* BWU613 */
 
 /* Accton products */
 #define	USB_PRODUCT_ACCTON_USB320_EC	0x1046		/* USB320-EC Ethernet */
@@ -478,6 +487,7 @@
 #define	USB_PRODUCT_ACTIONTEC_PRISM_25	0x0408		/* Prism2.5 WLAN */
 #define	USB_PRODUCT_ACTIONTEC_PRISM_25A	0x0421		/* Prism2.5 WLAN A */
 #define	USB_PRODUCT_ACTIONTEC_FREELAN	0x6106		/* ROPEX FreeLan 802.11b */
+#define	USB_PRODUCT_ACTIONTEC_802UAT1	0x7605		/* 802UAT1 */
 
 /* ACTiSYS products */
 #define	USB_PRODUCT_ACTISYS_IR2000U	0x0011		/* ACT-IR2000U FIR */
@@ -492,6 +502,9 @@
 /* Addonics products */
 #define	USB_PRODUCT_ADDONICS2_205	0xa001		/* Cable 205 */
 
+/* Addtron products */
+#define	USB_PRODUCT_ADDTRON_AWU120	0xff31		/* AWU-120 */
+
 /* ADMtek products */
 #define	USB_PRODUCT_ADMTEK_PEGASUSII_4	0x07c2		/* AN986A Ethernet */
 #define	USB_PRODUCT_ADMTEK_PEGASUS	0x0986		/* AN986 Ethernet */
@@ -569,7 +582,9 @@
 #define	USB_PRODUCT_ASANTE_EA	0x1427		/* Ethernet */
 
 /* Askey Computer products */
+#define	USB_PRODUCT_ASKEY_WLL013I	0x0320		/* WLL013 (Intersil) */
 #define	USB_PRODUCT_ASKEY_WLL013	0x0321		/* WLL013 */
+#define	USB_PRODUCT_ASKEY_VOYAGER1010	0x0821		/* Voyager 1010 */
 
 /* ASIX Electronics products */
 #define	USB_PRODUCT_ASIX_AX88172	0x1720		/* USB 2.0 10/100 ethernet controller */
@@ -590,11 +605,13 @@
 
 /* Atmel Comp. products */
 #define	USB_PRODUCT_ATMEL_UHB124	0x3301		/* UHB124 hub */
+#define	USB_PRODUCT_ATMEL_WN210	0x3301		/* W-Buddie WN210 */
 #define	USB_PRODUCT_ATMEL_DWL900AP	0x5601		/* DWL-900AP Wireless access point */
-#define	USB_PRODUCT_ATMEL_AT76C503A	0x7603		/* AT76c503a */
-#define	USB_PRODUCT_ATMEL_BW002	0x7605		/* BW002 */
-#define	USB_PRODUCT_ATMEL_WL1130	0x7613		/* WL-1130 */
-#define	USB_PRODUCT_ATMEL_AT76C505A	0x7614		/* AT76c505a */
+#define	USB_PRODUCT_ATMEL_AT76C503	0x7603		/* AT76C503 */
+#define	USB_PRODUCT_ATMEL_AT76C503RFMD	0x7605		/* AT76C503 RFMD */
+#define	USB_PRODUCT_ATMEL_AT76C505RFMD2958	0x7613		/* AT76C503 RFMD 2958 */
+#define	USB_PRODUCT_ATMEL_AT76C505A	0x7614		/* AT76C505A RFMD 2958 */
+#define	USB_PRODUCT_ATMEL_AT76C505AS	0x7617		/* AT76C505AS RFMD 2958 */
 
 /* Audio-Technica products */
 #define	USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB	0x0009		/* ATC-HA4USB USB headphone */
@@ -684,6 +701,7 @@
 /* Compaq products */
 #define	USB_PRODUCT_COMPAQ_IPAQPOCKETPC	0x0003		/* iPAQ PocketPC */
 #define	USB_PRODUCT_COMPAQ_A1500	0x0012		/* A1500 */
+#define	USB_PRODUCT_COMPAQ_IPAQWLAN	0x0032		/* iPAQ WLAN */
 #define	USB_PRODUCT_COMPAQ_W100	0x0033		/* W100 */
 #define	USB_PRODUCT_COMPAQ_W200	0x0076		/* WLAN MultiPort W200 */
 #define	USB_PRODUCT_COMPAQ_PJB100	0x504a		/* Personal Jukebox PJB100 */
@@ -691,6 +709,10 @@
 /* Conceptronic products */
 #define	USB_PRODUCT_BILLIONTON_SNAPPORT	0x90ff		/* SnapPort Ethernet */
 
+/* Conceptronic products */
+#define	USB_PRODUCT_CONCEPTRONIC_C11U	0x7100		/* C11U */
+#define	USB_PRODUCT_CONCEPTRONIC_WL210	0x7110		/* WL-210 */
+
 /* Concord Camera products */
 #define	USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X	0x0100		/* Eye Q 3x */
 
@@ -705,7 +727,9 @@
 #define	USB_PRODUCT_COREGA_WLANUSB	0x0012		/* Wireless LAN Stick-11 */
 #define	USB_PRODUCT_COREGA_FETHER_USB2_TX	0x0017		/* FEther USB2-TX */
 #define	USB_PRODUCT_COREGA_WLUSB_11_KEY	0x001a		/* ULUSB-11 Key */
+#define	USB_PRODUCT_COREGA_WLUSB_11_STICK	0x7613		/* WLAN USB Stick 11 */
 #define	USB_PRODUCT_COREGA_FETHER_USB_TXC	0x9601		/* FEther USB-TXC */
+
 /* Creative Labs products */
 #define	USB_PRODUCT_CREATIVE_NOMAD_II	0x1002		/* Nomad II */
 #define	USB_PRODUCT_CREATIVE_NOMAD_IIMG	0x4004		/* Nomad II MG */
@@ -739,6 +763,12 @@
 /* Diamond products */
 #define	USB_PRODUCT_DIAMOND_RIO500USB	0x0001		/* Rio 500 */
 
+/* Dick Smith Electronics products */
+#define	USB_PRODUCT_DICKSMITH_WL200U	0x0002		/* WL-200U */
+#define	USB_PRODUCT_DICKSMITH_CHUSB611G	0x0013		/* CHUSB 611G */
+#define	USB_PRODUCT_DICKSMITH_WL240U	0x0014		/* WL-240U */
+#define	USB_PRODUCT_DICKSMITH_XH1153	0x5743		/* HX1153 802.11b */
+
 /* Digi International products */
 #define	USB_PRODUCT_DIGI_ACCELEPORT2	0x0002		/* AccelePort 2 */
 #define	USB_PRODUCT_DIGI_ACCELEPORT4	0x0004		/* AccelePort 4 */
@@ -751,6 +781,7 @@
 /*product DLINK DSBS25		0x0100	DSB-S25 serial */
 #define	USB_PRODUCT_DLINK_DUBE100	0x1a00		/* 10/100 ethernet */
 #define	USB_PRODUCT_DLINK_DSB650TX4	0x200c		/* 10/100 ethernet */
+#define	USB_PRODUCT_DLINK_DWL120E	0x3200		/* DWL-120 rev E */
 #define	USB_PRODUCT_DLINK_DWL122	0x3700		/* DWL-122 */
 #define	USB_PRODUCT_DLINK_DWL120F	0x3702		/* DWL-120 rev F */
 #define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps ethernet */
@@ -865,6 +896,10 @@
 
 /* GIGABYTE products */
 #define	USB_PRODUCT_GIGABYTE_GNBR402W	0x8002		/* GN-BR402W */
+#define	USB_PRODUCT_GIGABYTE_GNWLBM101	0x8003		/* GN-WLBM101 */
+
+/* Gigaset products */
+#define	USB_PRODUCT_GIGASET_WLAN	0x0701		/* WLAN */
 
 /* GoHubs products */
 #define	USB_PRODUCT_GOHUBS_GOCOM232	0x1001		/* GoCOM232 Serial converter */
@@ -914,6 +949,7 @@
 #define	USB_PRODUCT_HP_4200C	0x0105		/* ScanJet 4200C */
 #define	USB_PRODUCT_HP_CDWRITERPLUS	0x0107		/* CD-Writer Plus */
 #define	USB_PRODUCT_HP_KBDHUB	0x010c		/* Multimedia Keyboard Hub */
+#define	USB_PRODUCT_HP_HN210W	0x011c		/* HN210W */
 #define	USB_PRODUCT_HP_6200C	0x0201		/* ScanJet 6200C */
 #define	USB_PRODUCT_HP_S20b	0x0202		/* PhotoSmart S20 */
 #define	USB_PRODUCT_HP_815C	0x0204		/* DeskJet 815C */
@@ -992,6 +1028,7 @@
 
 /* Intel products */
 #define	USB_PRODUCT_INTEL_EASYPC_CAMERA	0x0110		/* EasyPC */
+#define	USB_PRODUCT_INTEL_AP310	0x0200		/* AP310 AnyPoint II */
 #define	USB_PRODUCT_INTEL_I2011B	0x1111		/* Wireless 2011B */
 #define	USB_PRODUCT_INTEL_TESTBOARD	0x9890		/* 82930 test board */
 
@@ -1008,6 +1045,7 @@
 #define	USB_PRODUCT_IODATA_USBETT	0x0901		/* USB ETT */
 #define	USB_PRODUCT_IODATA_USBETTX	0x0904		/* USB ETTX */
 #define	USB_PRODUCT_IODATA_USBETTXS	0x0913		/* USB ETTX */
+#define	USB_PRODUCT_IODATA_USBWNB11A	0x0919		/* USB WN-B11 */
 #define	USB_PRODUCT_IODATA_USBWNB11	0x0922		/* USB Airport WN-B11 */
 #define	USB_PRODUCT_IODATA_USBRSAQ	0x0a03		/* RSAQ1 Serial */
 #define	USB_PRODUCT_IODATA2_USB2SC	0x0a09		/* USB2.0-SCSI Bridge USB2-SC */
@@ -1128,10 +1166,11 @@
 #define	USB_PRODUCT_LINKSYS_WUSB11_25	0x2212		/* WUSB11 802.11b v2.5 */
 #define	USB_PRODUCT_LINKSYS_WUSB12_11	0x2213		/* WUSB12 802.11b v1.1 */
 #define	USB_PRODUCT_LINKSYS2_USB200M	0x2226		/* USB 2.0 10/100 ethernet controller */
-#define	USB_PRODUCT_LINKSYS_USB10TX2	0x400b		/* USB10TX */
 #define	USB_PRODUCT_LINKSYS2_WUSB11	0x2219		/* WUSB11 */
+#define	USB_PRODUCT_LINKSYS2_NWU11B	0x2219		/* Network Everywhere NWU11B */
 #define	USB_PRODUCT_LINKSYS3_WUSB11V28	0x2233		/* WUSB11 v2.8 */
 #define	USB_PRODUCT_LINKSYS3_WUSB11V30	0x2236		/* WUSB11 v3.0 */
+#define	USB_PRODUCT_LINKSYS_USB10TX2	0x400b		/* USB10TX */
 
 /* Logitech products */
 #define	USB_PRODUCT_LOGITECH_M2452	0x0203		/* M2452 keyboard */
@@ -1194,6 +1233,7 @@
 #define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
 
 /* Micro Star International products */
+#define	USB_PRODUCT_MSI_WLAN	0x1020		/* WLAN */
 #define	USB_PRODUCT_MSI_BLUETOOTH	0x1967		/* Bluetooth */
 
 /* Micronet Communications products */
@@ -1404,6 +1444,7 @@
 
 /* Planex Communications products */
 #define	USB_PRODUCT_PLANEX_GW_US11H	0x14ea		/* GW-US11H WLAN */
+#define	USB_PRODUCT_PLANEX2_GW_US11S	0x3220		/* GW-US11S WLAN */
 
 /* Plantronics products */
 #define	USB_PRODUCT_PLANTRONICS_HEADSET	0x0ca1		/* Platronics DSP-400 Headset */
@@ -1541,6 +1582,7 @@
 #define	USB_PRODUCT_SHUTTLE_SCM	0x1010		/* SCM Micro */
 
 /* Siemens products */
+#define	USB_PRODUCT_SIEMENS2_WLL013	0x001b		/* WLL013 */
 #define	USB_PRODUCT_SIEMENS_SPEEDSTREAM	0x1001		/* SpeedStream */
 #define	USB_PRODUCT_SIEMENS_SPEEDSTREAM22	0x1022		/* SpeedStream 1022 */
 
@@ -1578,6 +1620,7 @@
 #define	USB_PRODUCT_SMC_2202USB	0x0200		/* 10/100 Ethernet */
 #define	USB_PRODUCT_SMC_2206USB	0x0201		/* EZ Connect Ethernet */
 #define	USB_PRODUCT_SMC2_2020HUB	0x2020		/* Hub */
+#define	USB_PRODUCT_SMC3_2662WV1	0xa001		/* EZ Connect 11Mbps */
 
 /* SOHOware products */
 #define	USB_PRODUCT_SOHOWARE_NUB100	0x9100		/* NUB100 Ethernet */
@@ -1665,6 +1708,7 @@
 /* Tekram Technology products */
 #define	USB_PRODUCT_TEKRAM_0193	0x1601		/* ALLNET 0193 WLAN */
 #define	USB_PRODUCT_TEKRAM_ZYAIR_B200	0x1602		/* ZyXEL ZyAIR B200 WLAN */
+#define	USB_PRODUCT_TEKRAM_U300C	0x1612		/* U-300C */
 
 /* Telex Communications products */
 #define	USB_PRODUCT_TELEX_MIC1	0x0001		/* Microphone */
@@ -1759,6 +1803,7 @@
 #define	USB_PRODUCT_YANO_U640MO	0x0101		/* U640MO-03 */
 
 /* Z-Com products */
+#define	USB_PRODUCT_ZCOM_M4Y750	0x0001		/* M4Y-750 */
 #define	USB_PRODUCT_ZCOM_XI725	0x0002		/* XI-725/726 */
 #define	USB_PRODUCT_ZCOM_XI735	0x0005		/* XI-735 */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index d87e81691c2..72b82871bc3 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.140 2005/03/05 14:12:59 itojun Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.141 2005/03/08 09:53:45 dlg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.136 2005/03/05 14:12:46 itojun Exp 
+ *	OpenBSD: usbdevs,v 1.137 2005/03/08 09:53:21 dlg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -65,6 +65,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "3C19250 Ethernet",
 	},
 	{
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3CRSHEW696,
+	    0,
+	    "3Com",
+	    "3CRSHEW696",
+	},
+	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
 	    0,
 	    "3Com",
@@ -185,6 +191,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "XX10",
 	},
 	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_BWU613,
+	    0,
+	    "AboCom Systems",
+	    "BWU613",
+	},
+	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC,
 	    0,
 	    "Accton Technology",
@@ -269,6 +281,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "ROPEX FreeLan 802.11b",
 	},
 	{
+	    USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_802UAT1,
+	    0,
+	    "Actiontec Electronics",
+	    "802UAT1",
+	},
+	{
 	    USB_VENDOR_ACTISYS, USB_PRODUCT_ACTISYS_IR2000U,
 	    0,
 	    "ACTiSYS",
@@ -299,6 +317,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Cable 205",
 	},
 	{
+	    USB_VENDOR_ADDTRON, USB_PRODUCT_ADDTRON_AWU120,
+	    0,
+	    "Addtron",
+	    "AWU-120",
+	},
+	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4,
 	    0,
 	    "ADMtek",
@@ -533,12 +557,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Ethernet",
 	},
 	{
+	    USB_VENDOR_ASKEY, USB_PRODUCT_ASKEY_WLL013I,
+	    0,
+	    "Askey Computer",
+	    "WLL013 (Intersil)",
+	},
+	{
 	    USB_VENDOR_ASKEY, USB_PRODUCT_ASKEY_WLL013,
 	    0,
 	    "Askey Computer",
 	    "WLL013",
 	},
 	{
+	    USB_VENDOR_ASKEY, USB_PRODUCT_ASKEY_VOYAGER1010,
+	    0,
+	    "Askey Computer",
+	    "Voyager 1010",
+	},
+	{
 	    USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172,
 	    0,
 	    "ASIX Electronics",
@@ -599,34 +635,46 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "UHB124 hub",
 	},
 	{
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_WN210,
+	    0,
+	    "Atmel",
+	    "W-Buddie WN210",
+	},
+	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL900AP,
 	    0,
 	    "Atmel",
 	    "DWL-900AP Wireless access point",
 	},
 	{
-	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503A,
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503,
 	    0,
 	    "Atmel",
-	    "AT76c503a",
+	    "AT76C503",
 	},
 	{
-	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_BW002,
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503RFMD,
 	    0,
 	    "Atmel",
-	    "BW002",
+	    "AT76C503 RFMD",
 	},
 	{
-	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_WL1130,
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505RFMD2958,
 	    0,
 	    "Atmel",
-	    "WL-1130",
+	    "AT76C503 RFMD 2958",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505A,
 	    0,
 	    "Atmel",
-	    "AT76c505a",
+	    "AT76C505A RFMD 2958",
+	},
+	{
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505AS,
+	    0,
+	    "Atmel",
+	    "AT76C505AS RFMD 2958",
 	},
 	{
 	    USB_VENDOR_AUDIOTECHNICA, USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB,
@@ -929,6 +977,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "A1500",
 	},
 	{
+	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQWLAN,
+	    0,
+	    "Compaq",
+	    "iPAQ WLAN",
+	},
+	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_W100,
 	    0,
 	    "Compaq",
@@ -953,6 +1007,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "SnapPort Ethernet",
 	},
 	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_C11U,
+	    0,
+	    "Conceptronic",
+	    "C11U",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_WL210,
+	    0,
+	    "Conceptronic",
+	    "WL-210",
+	},
+	{
 	    USB_VENDOR_CONCORDCAMERA, USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X,
 	    0,
 	    "Concord Camera",
@@ -1007,6 +1073,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "ULUSB-11 Key",
 	},
 	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLUSB_11_STICK,
+	    0,
+	    "Corega",
+	    "WLAN USB Stick 11",
+	},
+	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXC,
 	    0,
 	    "Corega",
@@ -1115,6 +1187,30 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Rio 500",
 	},
 	{
+	    USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_WL200U,
+	    0,
+	    "Dick Smith Electronics",
+	    "WL-200U",
+	},
+	{
+	    USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_CHUSB611G,
+	    0,
+	    "Dick Smith Electronics",
+	    "CHUSB 611G",
+	},
+	{
+	    USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_WL240U,
+	    0,
+	    "Dick Smith Electronics",
+	    "WL-240U",
+	},
+	{
+	    USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_XH1153,
+	    0,
+	    "Dick Smith Electronics",
+	    "HX1153 802.11b",
+	},
+	{
 	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2,
 	    0,
 	    "Digi International",
@@ -1151,6 +1247,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "10/100 ethernet",
 	},
 	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL120E,
+	    0,
+	    "D-Link",
+	    "DWL-120 rev E",
+	},
+	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL122,
 	    0,
 	    "D-Link",
@@ -1595,6 +1697,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "GN-BR402W",
 	},
 	{
+	    USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWLBM101,
+	    0,
+	    "GIGABYTE",
+	    "GN-WLBM101",
+	},
+	{
+	    USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_WLAN,
+	    0,
+	    "Gigaset",
+	    "WLAN",
+	},
+	{
 	    USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232,
 	    0,
 	    "GoHubs",
@@ -1745,6 +1859,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Multimedia Keyboard Hub",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_HN210W,
+	    0,
+	    "Hewlett Packard",
+	    "HN210W",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_6200C,
 	    0,
 	    "Hewlett Packard",
@@ -2129,6 +2249,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "EasyPC",
 	},
 	{
+	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_AP310,
+	    0,
+	    "Intel",
+	    "AP310 AnyPoint II",
+	},
+	{
 	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_I2011B,
 	    0,
 	    "Intel",
@@ -2189,6 +2315,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB ETTX",
 	},
 	{
+	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBWNB11A,
+	    0,
+	    "I/O Data",
+	    "USB WN-B11",
+	},
+	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBWNB11,
 	    0,
 	    "I/O Data",
@@ -2669,16 +2801,16 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB 2.0 10/100 ethernet controller",
 	},
 	{
-	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2,
+	    USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_WUSB11,
 	    0,
 	    "Linksys",
-	    "USB10TX",
+	    "WUSB11",
 	},
 	{
-	    USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_WUSB11,
+	    USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_NWU11B,
 	    0,
 	    "Linksys",
-	    "WUSB11",
+	    "Network Everywhere NWU11B",
 	},
 	{
 	    USB_VENDOR_LINKSYS3, USB_PRODUCT_LINKSYS3_WUSB11V28,
@@ -2693,6 +2825,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "WUSB11 v3.0",
 	},
 	{
+	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2,
+	    0,
+	    "Linksys",
+	    "USB10TX",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
 	    0,
 	    "Logitech",
@@ -2969,6 +3107,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Ricochet GS",
 	},
 	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_WLAN,
+	    0,
+	    "Micro Star International",
+	    "WLAN",
+	},
+	{
 	    USB_VENDOR_MSI, USB_PRODUCT_MSI_BLUETOOTH,
 	    0,
 	    "Micro Star International",
@@ -3767,6 +3911,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "GW-US11H WLAN",
 	},
 	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW_US11S,
+	    0,
+	    "Planex Communications",
+	    "GW-US11S WLAN",
+	},
+	{
 	    USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
 	    0,
 	    "Plantronics",
@@ -4277,6 +4427,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "SCM Micro",
 	},
 	{
+	    USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_WLL013,
+	    0,
+	    "Siemens",
+	    "WLL013",
+	},
+	{
 	    USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM,
 	    0,
 	    "Siemens",
@@ -4403,6 +4559,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Hub",
 	},
 	{
+	    USB_VENDOR_SMC3, USB_PRODUCT_SMC3_2662WV1,
+	    0,
+	    "SMC",
+	    "EZ Connect 11Mbps",
+	},
+	{
 	    USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100,
 	    0,
 	    "SOHOware",
@@ -4703,6 +4865,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "ZyXEL ZyAIR B200 WLAN",
 	},
 	{
+	    USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_U300C,
+	    0,
+	    "Tekram Technology",
+	    "U-300C",
+	},
+	{
 	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
 	    0,
 	    "Telex Communications",
@@ -4991,6 +5159,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "U640MO-03",
 	},
 	{
+	    USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_M4Y750,
+	    0,
+	    "Z-Com",
+	    "M4Y-750",
+	},
+	{
 	    USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_XI725,
 	    0,
 	    "Z-Com",
@@ -5837,6 +6011,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ADDTRON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Addtron",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SYMBOL, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Symbol Technologies",
@@ -6029,6 +6209,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SIEMENS2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Siemens",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MINOLTA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Minolta",
@@ -6863,15 +7049,15 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    USB_VENDOR_ELCON, 0,
+	    USB_VENDOR_TANGTOP, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ELCON Systemtechnik",
+	    "Tangtop",
 	    NULL,
 	},
 	{
-	    USB_VENDOR_TANGTOP, 0,
+	    USB_VENDOR_SMC3, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Tangtop",
+	    "SMC",
 	    NULL,
 	},
 	{
@@ -6887,12 +7073,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_CONCEPTRONIC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Conceptronic",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MSI, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Micro Star International",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ELCON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ELCON Systemtechnik",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_HAWKING, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Hawking",
@@ -7001,6 +7199,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_DICKSMITH, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Dick Smith Electronics",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SHARK, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Shark",
@@ -7055,6 +7259,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_GIGASET, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Gigaset",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_LINKSYS3, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Linksys",
@@ -7067,6 +7277,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_PLANEX2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Planex Communications",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MOTOROLA2, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Motorola",