sync

2 files changed, 213 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index e3145f9fc04..f0722583072 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.331 2007/12/07 05:05:05 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.332 2007/12/07 18:00:31 damien Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.322 2007/12/07 05:05:02 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.323 2007/12/07 17:59:32 damien Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -470,6 +470,7 @@
 #define	USB_VENDOR_BALTECH	0x13ad		/* Baltech */
 #define	USB_VENDOR_CISCOLINKSYS	0x13b1		/* Cisco-Linksys */
 #define	USB_VENDOR_SHARK	0x13d2		/* Shark */
+#define	USB_VENDOR_AZUREWAVE	0x13d3		/* AsureWave */
 #define	USB_VENDOR_NOVATEL	0x1410		/* Novatel Wireless */
 #define	USB_VENDOR_WISTRONNEWEB	0x1435		/* Wistron NeWeb */
 #define	USB_VENDOR_RADIOSHACK	0x1453		/* Radio Shack */
@@ -483,7 +484,9 @@
 #define	USB_VENDOR_OQO	0x1557		/* OQO */
 #define	USB_VENDOR_UMEDIA	0x157e		/* U-MEDIA Communications */
 #define	USB_VENDOR_FIBERLINE	0x1582		/* Fiberline */
+#define	USB_VENDOR_SPARKLAN	0x15a9		/* SparkLAN */
 #define	USB_VENDOR_OLIMEX	0x15ba		/* Olimex */
+#define	USB_VENDOR_AMIT2	0x15c5		/* AMIT */
 #define	USB_VENDOR_SOHOWARE	0x15e8		/* SOHOware */
 #define	USB_VENDOR_UMAX	0x1606		/* UMAX Data Systems */
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
@@ -580,11 +583,15 @@
 #define	USB_PRODUCT_ABOCOM_WUG2700	0xb21f		/* WUG2700 */
 
 /* Accton products */
+#define	USB_PRODUCT_ACCTON_RT2870_1	0x083a		/* RT2870 */
 #define	USB_PRODUCT_ACCTON_USB320_EC	0x1046		/* USB320-EC Ethernet */
 #define	USB_PRODUCT_ACCTON_2664W	0x3501		/* 2664W */
 #define	USB_PRODUCT_ACCTON_111	0x3503		/* T-Sinus 111 WLAN */
 #define	USB_PRODUCT_ACCTON_SMCWUSBG	0x4505		/* SMCWUSB-G */
 #define	USB_PRODUCT_ACCTON_SS1001	0x5046		/* SpeedStream Ethernet */
+#define	USB_PRODUCT_ACCTON_RT2870_2	0x6618		/* RT2870 */
+#define	USB_PRODUCT_ACCTON_RT2870_3	0x7522		/* RT2870 */
+#define	USB_PRODUCT_ACCTON_RT2870_4	0xa618		/* RT2870 */
 #define	USB_PRODUCT_ACCTON_ZD1211B	0xe501		/* ZD1211B */
 
 /* Aceeca products */
@@ -701,6 +708,7 @@
 
 /* AMIT products */
 #define	USB_PRODUCT_AMIT_CGWLUSB2GO	0x0002		/* CG-WLUSB2GO */
+#define	USB_PRODUCT_AMIT2_RT2870	0x0008		/* RT2870 */
 
 /* Analog Devices, Inc. products */
 #define	USB_PRODUCT_ANALOG_EAGLEI	0x900f		/* Eagle I */
@@ -760,6 +768,9 @@
 #define	USB_PRODUCT_ASUS_WL159G	0x170c		/* WL-159g */
 #define	USB_PRODUCT_ASUS_MYPAL_A730	0x4202		/* MyPal A730 */
 #define	USB_PRODUCT_ASUS_A9T_WIFI	0x171b		/* A9T wireless */
+#define	USB_PRODUCT_ASUS_RT2870_1	0x1731		/* RT2870 */
+#define	USB_PRODUCT_ASUS_RT2870_2	0x1732		/* RT2870 */
+#define	USB_PRODUCT_ASUS_RT2870_3	0x1742		/* RT2870 */
 
 /* ASUSTeK Computer products */
 #define	USB_PRODUCT_ASUSTEK_WL140	0x3300		/* WL-140 */
@@ -812,6 +823,9 @@
 /* Avision products */
 #define	USB_PRODUCT_AVISION_1200U	0x0268		/* 1200U */
 
+/* AsureWave products */
+#define	USB_PRODUCT_AZUREWAVE_RT2870	0x3247		/* RT2870 */
+
 /* B&B Electronics products */
 #define	USB_PRODUCT_BBELECTRONICS_USOTL4	0xAC01		/* uLinks RS-422/485 */
 
@@ -840,6 +854,7 @@
 #define	USB_PRODUCT_BELKIN_F5D7050	0x7050		/* F5D7050 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D7050A	0x705a		/* F5D705A 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D7050C	0x705c		/* F5D705C 54g USB Network Adapter */
+#define	USB_PRODUCT_BELKIN_RT2870	0x8053		/* RT2870 */
 #define	USB_PRODUCT_BELKIN_F5D9050V3	0x905b		/* F5D9050 ver 3 */
 
 /* Billionton products */
@@ -943,6 +958,12 @@
 #define	USB_PRODUCT_CONCEPTRONIC_AR5523_2_NF	0x7812		/* AR5523 */
 #define	USB_PRODUCT_CONCEPTRONIC2_C54RU	0x3c02		/* C54RU WLAN */
 #define	USB_PRODUCT_CONCEPTRONIC2_C54RU2	0x3c22		/* C54RU */
+#define	USB_PRODUCT_CONCEPTRONIC2_RT2870_1	0x3c06		/* RT2870 */
+#define	USB_PRODUCT_CONCEPTRONIC2_RT2870_2	0x3c07		/* RT2870 */
+#define	USB_PRODUCT_CONCEPTRONIC2_RT2870_3	0x3c23		/* RT2870 */
+#define	USB_PRODUCT_CONCEPTRONIC2_RT2870_4	0x3c25		/* RT2870 */
+#define	USB_PRODUCT_CONCEPTRONIC2_RT2870_5	0x3c27		/* RT2870 */
+#define	USB_PRODUCT_CONCEPTRONIC2_RT2870_6	0x3c28		/* RT2870 */
 
 /* Concord Camera products */
 #define	USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X	0x0100		/* Eye Q 3x */
@@ -958,6 +979,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_RT2870_1	0x002f		/* RT2870 */
+#define	USB_PRODUCT_COREGA_RT2870_2	0x003c		/* RT2870 */
+#define	USB_PRODUCT_COREGA_RT2870_3	0x003f		/* RT2870 */
 #define	USB_PRODUCT_COREGA_WLUSB_11_STICK	0x7613		/* WLAN USB Stick 11 */
 #define	USB_PRODUCT_COREGA_FETHER_USB_TXC	0x9601		/* FEther USB-TXC */
 
@@ -976,6 +1000,7 @@
 
 /* CyberTAN Technology products */
 #define	USB_PRODUCT_CYBERTAN_TG54USB	0x1666		/* TG54USB */
+#define	USB_PRODUCT_CYBERTAN_RT2870	0x1828		/* RT2870 */
 
 /* Cypress Semiconductor products */
 #define	USB_PRODUCT_CYPRESS_MOUSE	0x0001		/* mouse */
@@ -1044,6 +1069,7 @@
 #define	USB_PRODUCT_DLINK2_DWLG122C1	0x3c03		/* DWL-G122 rev C1 */
 #define	USB_PRODUCT_DLINK2_WUA1340	0x3c04		/* WUA-1340 */
 #define	USB_PRODUCT_DLINK_DUBE100B1	0x3c05		/* DUB-E100 rev B1 */
+#define	USB_PRODUCT_DLINK2_RT2870	0x3c09		/* RT2870 */
 #define	USB_PRODUCT_DLINK_DSB650C	0x4000		/* 10Mbps ethernet */
 #define	USB_PRODUCT_DLINK_DSB650TX1	0x4001		/* 10/100 ethernet */
 #define	USB_PRODUCT_DLINK_DSB650TX	0x4002		/* 10/100 ethernet */
@@ -1205,6 +1231,7 @@
 #define	USB_PRODUCT_GIGABYTE_GNWBKG	0x8007		/* GN-WBKG */
 #define	USB_PRODUCT_GIGABYTE_GNWB01GS	0x8008		/* GN-WB01GS */
 #define	USB_PRODUCT_GIGABYTE_GNWI05GS	0x800a		/* GN-WI05GS */
+#define	USB_PRODUCT_GIGABYTE_RT2870	0x800b		/* RT2870 */
 
 /* Gigaset products */
 #define	USB_PRODUCT_GIGASET_WLAN	0x0701		/* WLAN */
@@ -1265,6 +1292,8 @@
 #define	USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM	0x4d12		/* WinTV FM */
 
 /* Hawking Technologies products */
+#define	USB_PRODUCT_HAWKING_RT2870_1	0x0001		/* RT2870 */
+#define	USB_PRODUCT_HAWKING_RT2870_2	0x0003		/* RT2870 */
 #define	USB_PRODUCT_HAWKING_UF100	0x400c		/* 10/100 Ethernet */
 #define	USB_PRODUCT_ABOCOM_UF200	0x420a		/* UF200 Ethernet */
 
@@ -1878,6 +1907,7 @@
 #define	USB_PRODUCT_PHILIPS_SNU6500	0x1233		/* SNU6500 */
 #define	USB_PRODUCT_PHILIPS_SNU5600	0x1236		/* SNU5600 */
 #define	USB_PRODUCT_PHILIPS_DIVAUSB	0x1801		/* DIVA mp3 player */
+#define	USB_PRODUCT_PHILIPS_RT2870	0x200f		/* RT2870 */
 
 /* Philips Semiconductor products */
 #define	USB_PRODUCT_PHILIPSSEMI_HUB1122	0x1122		/* hub */
@@ -1901,6 +1931,7 @@
 #define	USB_PRODUCT_PLANEX2_GWUS54GZL	0xc007		/* GW-US54GZL */
 #define	USB_PRODUCT_PLANEX2_GWUS54GD	0xed01		/* GW-US54GD */
 #define	USB_PRODUCT_PLANEX2_GWUSMM	0xed02		/* GW-USMM */
+#define	USB_PRODUCT_PLANEX2_RT2870	0xed06		/* RT2870 */
 #define	USB_PRODUCT_PLANEX3_GWUS54GZ	0xab10		/* GW-US54GZ */
 
 /* Plantronics products */
@@ -1981,6 +2012,8 @@
 #define	USB_PRODUCT_RALINK_RT2573	0x2573		/* RT2573 */
 #define	USB_PRODUCT_RALINK_RT2671	0x2671		/* RT2671 */
 #define	USB_PRODUCT_RALINK_RT2573_2	0x9021		/* RT2573 */
+#define	USB_PRODUCT_RALINK_RT2770	0x2770		/* RT2770 */
+#define	USB_PRODUCT_RALINK_RT2870	0x2870		/* RT2870 */
 
 /* RATOC Systems products */
 #define	USB_PRODUCT_RATOC_REXUSB60	0xb000		/* USB serial REX-USB60 */
@@ -2055,6 +2088,8 @@
 /* Senao products */
 #define	USB_PRODUCT_SENAO_NUB8301	0x2000		/* NUB-8301 */
 #define	USB_PRODUCT_SENAO_NUB862	0x6100		/* NUB-862 */
+#define	USB_PRODUCT_SENAO_RT2870_1	0x9701		/* RT2870 */
+#define	USB_PRODUCT_SENAO_RT2870_2	0x9702		/* RT2870 */
 
 /* Serverworks */
 #define	USB_PRODUCT_SERVERWORKS_HUB	0x0000		/* Root Hub */
@@ -2156,6 +2191,10 @@
 #define	USB_PRODUCT_SITECOM_CN104	0x2068		/* CN104 */
 
 /* Sitecom Europe products */
+#define	USB_PRODUCT_SITECOMEU_RT2870_1	0x0017		/* RT2870 */
+#define	USB_PRODUCT_SITECOMEU_RT2870_2	0x002b		/* RT2870 */
+#define	USB_PRODUCT_SITECOMEU_RT2870_3	0x002c		/* RT2870 */
+#define	USB_PRODUCT_SITECOMEU_RT2870_4	0x002d		/* RT2870 */
 #define	USB_PRODUCT_SITECOMEU_LN028	0x061c		/* LN-028 */
 #define	USB_PRODUCT_SITECOMEU_WL113	0x9071		/* WL-113 */
 #define	USB_PRODUCT_SITECOMEU_ZD1211B	0x9075		/* ZD1211B */
@@ -2208,6 +2247,9 @@
 #define	USB_PRODUCT_SOURCENEXT_KEIKAI8	0x039f		/* KeikaiDenwa 8 */
 #define	USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG	0x012e		/* KeikaiDenwa 8 with charger */
 
+/* SparkLAN products */
+#define	USB_PRODUCT_SPARKLAN_RT2870	0x0006		/* RT2870 */
+
 /* Speed Dragon Multimedia products */
 #define	USB_PRODUCT_SPEEDDRAGON_MS3303H	0x110b		/* MS3303H Serial */
 
@@ -2461,6 +2503,8 @@
 #define	USB_PRODUCT_ZCOM_AR5523	0x0012		/* AR5523 */
 #define	USB_PRODUCT_ZCOM_AR5523_NF	0x0013		/* AR5523 driver */
 #define	USB_PRODUCT_ZCOM_ZD1211B	0x001a		/* ZD1211B */
+#define	USB_PRODUCT_ZCOM_RT2870_1	0x0022		/* RT2870 */
+#define	USB_PRODUCT_ZCOM_RT2870_2	0x0025		/* RT2870 */
 
 /* Zinwell products */
 #define	USB_PRODUCT_ZINWELL_RT2570	0x0260		/* RT2570 */
@@ -2483,4 +2527,5 @@
 #define	USB_PRODUCT_ZYXEL_G270S	0x340c		/* G-270S */
 #define	USB_PRODUCT_ZYXEL_G220V2	0x340f		/* G-220 v2 */
 #define	USB_PRODUCT_ZYXEL_G202	0x3410		/* G-202 */
+#define	USB_PRODUCT_ZYXEL_RT2870	0x3416		/* RT2870 */
 #define	USB_PRODUCT_ZYXEL_PRESTIGE	0x401a		/* Prestige */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 5367cf0ce6b..5e43e39289e 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.327 2007/12/07 05:05:05 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.328 2007/12/07 18:00:31 damien Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.322 2007/12/07 05:05:02 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.323 2007/12/07 17:59:32 damien Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -205,6 +205,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "WUG2700",
 	},
 	{
+	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT2870_1,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC,
 	    "USB320-EC Ethernet",
 	},
@@ -225,6 +229,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "SpeedStream Ethernet",
 	},
 	{
+	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT2870_3,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT2870_4,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_ZD1211B,
 	    "ZD1211B",
 	},
@@ -461,6 +477,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "CG-WLUSB2GO",
 	},
 	{
+	    USB_VENDOR_AMIT2, USB_PRODUCT_AMIT2_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEI,
 	    "Eagle I",
 	},
@@ -601,6 +621,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "A9T wireless",
 	},
 	{
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2870_3,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_WL140,
 	    "WL-140",
 	},
@@ -725,6 +757,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "1200U",
 	},
 	{
+	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4,
 	    "uLinks RS-422/485",
 	},
@@ -813,6 +849,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "F5D705C 54g USB Network Adapter",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D9050V3,
 	    "F5D9050 ver 3",
 	},
@@ -1081,6 +1121,30 @@ const struct usb_known_product usb_known_products[] = {
 	    "C54RU",
 	},
 	{
+	    USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_3,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_4,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_5,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_6,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_CONCORDCAMERA, USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X,
 	    "Eye Q 3x",
 	},
@@ -1117,6 +1181,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "ULUSB-11 Key",
 	},
 	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_RT2870_3,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLUSB_11_STICK,
 	    "WLAN USB Stick 11",
 	},
@@ -1157,6 +1233,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "TG54USB",
 	},
 	{
+	    USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_MOUSE,
 	    "mouse",
 	},
@@ -1337,6 +1417,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "DUB-E100 rev B1",
 	},
 	{
+	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C,
 	    "10Mbps ethernet",
 	},
@@ -1781,6 +1865,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "GN-WI05GS",
 	},
 	{
+	    USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_WLAN,
 	    "WLAN",
 	},
@@ -1901,6 +1989,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "WinTV FM",
 	},
 	{
+	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RT2870_2,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100,
 	    "10/100 Ethernet",
 	},
@@ -3617,6 +3713,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "DIVA mp3 player",
 	},
 	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_PHILIPSSEMI, USB_PRODUCT_PHILIPSSEMI_HUB1122,
 	    "hub",
 	},
@@ -3677,6 +3777,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "GW-USMM",
 	},
 	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54GZ,
 	    "GW-US54GZ",
 	},
@@ -3877,6 +3981,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2573",
 	},
 	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2770,
+	    "RT2770",
+	},
+	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
 	    "USB serial REX-USB60",
 	},
@@ -4053,6 +4165,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "NUB-862",
 	},
 	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT2870_2,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_SERVERWORKS, USB_PRODUCT_SERVERWORKS_HUB,
 	    "Root Hub",
 	},
@@ -4329,6 +4449,22 @@ const struct usb_known_product usb_known_products[] = {
 	    "CN104",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2870_2,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2870_3,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT2870_4,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_LN028,
 	    "LN-028",
 	},
@@ -4477,6 +4613,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "KeikaiDenwa 8 with charger",
 	},
 	{
+	    USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_SPEEDDRAGON, USB_PRODUCT_SPEEDDRAGON_MS3303H,
 	    "MS3303H Serial",
 	},
@@ -5049,6 +5189,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "ZD1211B",
 	},
 	{
+	    USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_RT2870_2,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT2570,
 	    "RT2570",
 	},
@@ -5105,6 +5253,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "G-202",
 	},
 	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_PRESTIGE,
 	    "Prestige",
 	},
@@ -6737,6 +6889,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Shark",
 	},
 	{
+	    USB_VENDOR_AZUREWAVE,
+	    "AsureWave",
+	},
+	{
 	    USB_VENDOR_NOVATEL,
 	    "Novatel Wireless",
 	},
@@ -6789,10 +6945,18 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Fiberline",
 	},
 	{
+	    USB_VENDOR_SPARKLAN,
+	    "SparkLAN",
+	},
+	{
 	    USB_VENDOR_OLIMEX,
 	    "Olimex",
 	},
 	{
+	    USB_VENDOR_AMIT2,
+	    "AMIT",
+	},
+	{
 	    USB_VENDOR_SOHOWARE,
 	    "SOHOware",
 	},