Update to FreeBSD head 2017-01-09

Git mirror commit 1f8e4a995a6ede4bdb24e6d335ccda2bdb0175ab.

2 files changed, 254 insertions, 56 deletions

diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs.h b/rtemsbsd/include/rtems/bsd/local/usbdevs.h
index ccee2efd..941a7ac7 100644
--- a/rtemsbsd/include/rtems/bsd/local/usbdevs.h
+++ b/rtemsbsd/include/rtems/bsd/local/usbdevs.h
@@ -746,6 +746,7 @@
 #define	USB_VENDOR_ERICSSON	0x2282		/* Ericsson */
 #define	USB_VENDOR_MOTOROLA2	0x22b8		/* Motorola */
 #define	USB_VENDOR_WETELECOM	0x22de		/* WeTelecom */
+#define	USB_VENDOR_TPLINK	0x2357		/* TP-Link */
 #define	USB_VENDOR_WESTMOUNTAIN	0x2405		/* West Mountain Radio */
 #define	USB_VENDOR_TRIPPLITE	0x2478		/* Tripp-Lite */
 #define	USB_VENDOR_HIROSE	0x2631		/* Hirose Electric */
@@ -1213,6 +1214,7 @@
 #define	USB_PRODUCT_ASUS_USBN66	0x17ad		/* USB-N66 */
 #define	USB_PRODUCT_ASUS_USBN10NANO	0x17ba		/* USB-N10 Nano */
 #define	USB_PRODUCT_ASUS_USBAC51	0x17d1		/* USB-AC51 */
+#define	USB_PRODUCT_ASUS_USBAC56	0x17d2		/* USB-AC56 */
 #define	USB_PRODUCT_ASUS_A730W	0x4202		/* ASUS MyPal A730W */
 #define	USB_PRODUCT_ASUS_P535	0x420f		/* ASUS P535 PDA */
 #define	USB_PRODUCT_ASUS_GMSC	0x422f		/* ASUS Generic Mass Storage */
@@ -1245,7 +1247,7 @@
 
 /* Atmel Comp. products */
 #define	USB_PRODUCT_ATMEL_STK541	0x2109		/* Zigbee Controller */
-#define	USB_PRODUCT_ATMEL_UHB124	0x3301		/* UHB124 hub */
+#define	USB_PRODUCT_ATMEL_UHB124	0x3301		/* AT43301 USB 1.1 Hub */
 #define	USB_PRODUCT_ATMEL_DWL120	0x7603		/* DWL-120 Wireless Adapter */
 #define	USB_PRODUCT_ATMEL_BW002	0x7605		/* BW002 Wireless Adapter */
 #define	USB_PRODUCT_ATMEL_WL1130USB	0x7613		/* WL-1130 USB */
@@ -1433,6 +1435,7 @@
 #define	USB_PRODUCT_CISCOLINKSYS_WUSB54GR	0x0023		/* WUSB54GR */
 #define	USB_PRODUCT_CISCOLINKSYS_WUSBF54G	0x0024		/* WUSBF54G */
 #define	USB_PRODUCT_CISCOLINKSYS_AE1000	0x002f		/* AE1000 */
+#define	USB_PRODUCT_CISCOLINKSYS_WUSB6300	0x003f		/* WUSB6300 */
 #define	USB_PRODUCT_CISCOLINKSYS_USB3GIGV1	0x0041		/* USB3GIGV1 USB Ethernet Adapter */
 #define	USB_PRODUCT_CISCOLINKSYS2_RT3070	0x4001		/* RT3070 */
 #define	USB_PRODUCT_CISCOLINKSYS3_RT3070	0x0101		/* RT3070 */
@@ -1625,8 +1628,18 @@
 #define	USB_PRODUCT_DLINK_DUBE100C1	0x1a02		/* DUB-E100 rev C1 */
 #define	USB_PRODUCT_DLINK_DSB650TX4	0x200c		/* 10/100 Ethernet */
 #define	USB_PRODUCT_DLINK_DWL120E	0x3200		/* DWL-120 rev E */
+#define	USB_PRODUCT_DLINK_RTL8192CU_1	0x3307		/* RTL8192CU */
+#define	USB_PRODUCT_DLINK_RTL8188CU	0x3308		/* RTL8188CU */
+#define	USB_PRODUCT_DLINK_RTL8192CU_2	0x3309		/* RTL8192CU */
+#define	USB_PRODUCT_DLINK_RTL8192CU_3	0x330a		/* RTL8192CU */
+#define	USB_PRODUCT_DLINK_DWA131B	0x330d		/* DWA-131 rev B */
 #define	USB_PRODUCT_DLINK_DWA125D1	0x330f		/* DWA-125 rev D1 */
 #define	USB_PRODUCT_DLINK_DWA123D1	0x3310		/* DWA-123 rev D1 */
+#define	USB_PRODUCT_DLINK_DWA171A1	0x3314		/* DWA-171 rev A1 */
+#define	USB_PRODUCT_DLINK_DWA182C1	0x3315		/* DWA-182 rev C1 */
+#define	USB_PRODUCT_DLINK_DWA180A1	0x3316		/* DWA-180 rev A1 */
+#define	USB_PRODUCT_DLINK_DWA172A1	0x3318		/* DWA-172 rev A1 */
+#define	USB_PRODUCT_DLINK_DWA131E1	0x3319		/* DWA-131 rev E1 */
 #define	USB_PRODUCT_DLINK_DWL122	0x3700		/* DWL-122 */
 #define	USB_PRODUCT_DLINK_DWLG120	0x3701		/* DWL-G120 */
 #define	USB_PRODUCT_DLINK_DWL120F	0x3702		/* DWL-120 rev F */
@@ -1652,17 +1665,12 @@
 #define	USB_PRODUCT_DLINK_DSB650TX3	0x400b		/* 10/100 Ethernet */
 #define	USB_PRODUCT_DLINK_DSB650TX2	0x4102		/* 10/100 Ethernet */
 #define	USB_PRODUCT_DLINK_DUB1312	0x4a00		/* 10/100/1000 Ethernet */
-#define	USB_PRODUCT_DLINK_DSB650	0xabc1		/* 10/100 Ethernet */
-#define	USB_PRODUCT_DLINK_DUBH7	0xf103		/* DUB-H7 USB 2.0 7-Port Hub */
-#define	USB_PRODUCT_DLINK_DWR510_CD	0xa805		/* DWR-510 CD-ROM Mode */
-#define	USB_PRODUCT_DLINK_DWR510	0x7e12		/* DWR-510 */
 #define	USB_PRODUCT_DLINK_DWM157	0x7d02		/* DWM-157 */
+#define	USB_PRODUCT_DLINK_DWR510	0x7e12		/* DWR-510 */
 #define	USB_PRODUCT_DLINK_DWM157_CD	0xa707		/* DWM-157 CD-ROM Mode */
-#define	USB_PRODUCT_DLINK_RTL8188CU	0x3308		/* RTL8188CU */
-#define	USB_PRODUCT_DLINK_RTL8192CU_1	0x3307		/* RTL8192CU */
-#define	USB_PRODUCT_DLINK_RTL8192CU_2	0x3309		/* RTL8192CU */
-#define	USB_PRODUCT_DLINK_RTL8192CU_3	0x330a		/* RTL8192CU */
-#define	USB_PRODUCT_DLINK_DWA131B	0x330d		/* DWA-131 rev B */
+#define	USB_PRODUCT_DLINK_DWR510_CD	0xa805		/* DWR-510 CD-ROM Mode */
+#define	USB_PRODUCT_DLINK_DSB650	0xabc1		/* 10/100 Ethernet */
+#define	USB_PRODUCT_DLINK_DUBH7	0xf103		/* DUB-H7 USB 2.0 7-Port Hub */
 #define	USB_PRODUCT_DLINK2_RTL8192SU_1	0x3300		/* RTL8192SU */
 #define	USB_PRODUCT_DLINK2_RTL8192SU_2	0x3302		/* RTL8192SU */
 #define	USB_PRODUCT_DLINK2_DWA131A1	0x3303		/* DWA-131 A1 */
@@ -1673,8 +1681,8 @@
 #define	USB_PRODUCT_DLINK2_DWLG122C1	0x3c03		/* DWL-G122 c1 */
 #define	USB_PRODUCT_DLINK2_WUA1340	0x3c04		/* WUA-1340 */
 #define	USB_PRODUCT_DLINK2_DWA111	0x3c06		/* DWA-111 */
-#define	USB_PRODUCT_DLINK2_RT2870_1	0x3c09		/* RT2870 */
 #define	USB_PRODUCT_DLINK2_DWA110	0x3c07		/* DWA-110 */
+#define	USB_PRODUCT_DLINK2_RT2870_1	0x3c09		/* RT2870 */
 #define	USB_PRODUCT_DLINK2_RT3072	0x3c0a		/* RT3072 */
 #define	USB_PRODUCT_DLINK2_RT3072_1	0x3c0b		/* RT3072 */
 #define	USB_PRODUCT_DLINK2_RT3070_1	0x3c0d		/* RT3070 */
@@ -1745,6 +1753,9 @@
 #define	USB_PRODUCT_EDIMAX_EW7733UND	0x7733		/* EW-7733UnD */
 #define	USB_PRODUCT_EDIMAX_EW7811UN	0x7811		/* EW-7811Un */
 #define	USB_PRODUCT_EDIMAX_RTL8192CU	0x7822		/* RTL8192CU */
+#define	USB_PRODUCT_EDIMAX_EW7811UTC_1	0xa811		/* EW-7811UTC */
+#define	USB_PRODUCT_EDIMAX_EW7811UTC_2	0xa812		/* EW-7811UTC */
+#define	USB_PRODUCT_EDIMAX_EW7822UAC	0xa822		/* EW-7822UAC */
 
 /* eGalax Products */
 #define	USB_PRODUCT_EGALAX_TPANEL	0x0001		/* Touch Panel */
@@ -2170,7 +2181,8 @@
 /* Genesys Logic products */
 #define	USB_PRODUCT_GENESYS_GL620USB	0x0501		/* GL620USB Host-Host interface */
 #define	USB_PRODUCT_GENESYS_GL650	0x0604		/* GL650 HUB */
-#define	USB_PRODUCT_GENESYS_GL606	0x0606		/* USB 2.0 HUB */
+#define	USB_PRODUCT_GENESYS_GL606	0x0606		/* GL606 USB 2.0 HUB */
+#define	USB_PRODUCT_GENESYS_GL850G	0x0608		/* GL850G USB 2.0 HUB */
 #define	USB_PRODUCT_GENESYS_GL641USB	0x0700		/* GL641USB CompactFlash Card Reader */
 #define	USB_PRODUCT_GENESYS_GL641USB2IDE_2	0x0701		/* GL641USB USB-IDE Bridge No 2 */
 #define	USB_PRODUCT_GENESYS_GL641USB2IDE	0x0702		/* GL641USB USB-IDE Bridge */
@@ -2268,6 +2280,7 @@
 #define	USB_PRODUCT_HAWKING_UF100	0x400c		/* 10/100 USB Ethernet */
 #define	USB_PRODUCT_HAWKING_RTL8192SU_1	0x0015		/* RTL8192SU */
 #define	USB_PRODUCT_HAWKING_RTL8192SU_2	0x0016		/* RTL8192SU */
+#define	USB_PRODUCT_HAWKING_HD65U	0x0023		/* HD65U */
 
 /* HID Global GmbH products */
 #define	USB_PRODUCT_HIDGLOBAL_CM2020	0x0596		/* Omnikey Cardman 2020 */
@@ -2427,6 +2440,7 @@
 #define	USB_PRODUCT_HUAWEI_ME909U	0x1573		/* LTE modem */
 #define	USB_PRODUCT_HUAWEI_R215_INIT	0x1582		/* LTE modem initial */
 #define	USB_PRODUCT_HUAWEI_R215	0x1588		/* LTE modem */
+#define	USB_PRODUCT_HUAWEI_ME909S	0x15c1		/* LTE modem */
 #define	USB_PRODUCT_HUAWEI_ETS2055	0x1803		/* CDMA modem */
 #define	USB_PRODUCT_HUAWEI_E173	0x1c05		/* 3G modem */
 #define	USB_PRODUCT_HUAWEI_E173_INIT	0x1c0b		/* 3G modem initial */
@@ -2508,6 +2522,7 @@
 #define	USB_PRODUCT_IODATA_RT3072_2	0x0945		/* RT3072 */
 #define	USB_PRODUCT_IODATA_RT3072_3	0x0947		/* RT3072 */
 #define	USB_PRODUCT_IODATA_RT3072_4	0x0948		/* RT3072 */
+#define	USB_PRODUCT_IODATA_WNAC867U	0x0952		/* WN-AC867U */
 #define	USB_PRODUCT_IODATA_USBRSAQ	0x0a03		/* Serial USB-RSAQ1 */
 #define	USB_PRODUCT_IODATA_USBRSAQ5	0x0a0e		/* Serial USB-RSAQ5 */
 #define	USB_PRODUCT_IODATA2_USB2SC	0x0a09		/* USB2.0-SCSI Bridge USB2-SC */
@@ -3067,6 +3082,8 @@
 #define	USB_PRODUCT_MELCO_WLIUCGNM	0x01a2		/* WLI-UC-GNM */
 #define	USB_PRODUCT_MELCO_WLIUCG300HPV1	0x01a8		/* WLI-UC-G300HP-V1 */
 #define	USB_PRODUCT_MELCO_WLIUCGNM2	0x01ee		/* WLI-UC-GNM2 */
+#define	USB_PRODUCT_MELCO_WIU2433DM	0x0242		/* WI-U2-433DM */
+#define	USB_PRODUCT_MELCO_WIU3866D	0x025d		/* WI-U3-866D */
 
 /* Merlin products */
 #define	USB_PRODUCT_MERLIN_V620	0x1110		/* Merlin V620 */
@@ -3246,6 +3263,7 @@
 #define	USB_PRODUCT_NEC_HUB_0050	0x0050		/* USB 2.0 7-Port Hub */
 #define	USB_PRODUCT_NEC_HUB_005A	0x005a		/* USB 2.0 4-Port Hub */
 #define	USB_PRODUCT_NEC_WL300NUG	0x0249		/* WL300NU-G */
+#define	USB_PRODUCT_NEC_WL900U	0x0408		/* Aterm WL900U */
 #define	USB_PRODUCT_NEC_HUB	0x55aa		/* hub */
 #define	USB_PRODUCT_NEC_HUB_B	0x55ab		/* hub */
 
@@ -3285,6 +3303,7 @@
 #define	USB_PRODUCT_NETGEAR_RTL8192CU	0x9021		/* RTL8192CU */
 #define	USB_PRODUCT_NETGEAR_WNA1000	0x9040		/* WNA1000 */
 #define	USB_PRODUCT_NETGEAR_WNA1000M	0x9041		/* WNA1000M */
+#define	USB_PRODUCT_NETGEAR_A6100	0x9052		/* A6100 */
 #define	USB_PRODUCT_NETGEAR2_MA101	0x4100		/* MA101 */
 #define	USB_PRODUCT_NETGEAR2_MA101B	0x4102		/* MA101 Rev B */
 #define	USB_PRODUCT_NETGEAR3_WG111T	0x4250		/* WG111T */
@@ -3557,6 +3576,7 @@
 #define	USB_PRODUCT_PLANEX2_GWUS300MINIS	0xab24		/* GW-US300MiniS */
 #define	USB_PRODUCT_PLANEX2_RT3070	0xab25		/* RT3070 */
 #define	USB_PRODUCT_PLANEX2_MZKUE150N	0xab2f		/* MZK-UE150N */
+#define	USB_PRODUCT_PLANEX2_GW900D	0xab30		/* GW-900D */
 #define	USB_PRODUCT_PLANEX2_GWUS54MINI2	0xab50		/* GW-US54Mini2 */
 #define	USB_PRODUCT_PLANEX2_GWUS54SG	0xc002		/* GW-US54SG */
 #define	USB_PRODUCT_PLANEX2_GWUS54GZL	0xc007		/* GW-US54GZL */
@@ -3807,6 +3827,7 @@
 #define	USB_PRODUCT_REALTEK_RTL8173	0x8173		/* RTL8173 */
 #define	USB_PRODUCT_REALTEK_RTL8174	0x8174		/* RTL8174 */
 #define	USB_PRODUCT_REALTEK_RTL8188CU_0	0x8176		/* RTL8188CU */
+#define	USB_PRODUCT_REALTEK_RTL8192CU_1	0x8178		/* RTL8192CU */
 #define	USB_PRODUCT_REALTEK_RTL8188EU	0x8179		/* RTL8188EU */
 #define	USB_PRODUCT_REALTEK_RTL8188CE_1	0x817e		/* RTL8188CE */
 #define	USB_PRODUCT_REALTEK_RTL8188CU_1	0x817a		/* RTL8188CU */
@@ -3970,6 +3991,7 @@
 #define	USB_PRODUCT_SEALEVEL_2803_8	0x2883		/* FTDI compatible adapter */
 
 /* Senao products */
+#define	USB_PRODUCT_SENAO_EUB1200AC	0x0100		/* EnGenius EUB1200AC */
 #define	USB_PRODUCT_SENAO_RT2870_3	0x0605		/* RT2870 */
 #define	USB_PRODUCT_SENAO_RT2870_4	0x0615		/* RT2870 */
 #define	USB_PRODUCT_SENAO_NUB8301	0x2000		/* NUB-8301 */
@@ -4089,6 +4111,7 @@
 #define	USB_PRODUCT_SIERRA_MC8700	0x68A3		/* MC8700 */
 #define	USB_PRODUCT_SIERRA_MC7354	0x68C0		/* MC7354 */
 #define	USB_PRODUCT_SIERRA_MC7355	0x9041		/* MC7355 */
+#define	USB_PRODUCT_SIERRA_MC7430	0x9071		/* Sierra Wireless MC7430 Qualcomm Snapdragon X7 LTE-A */
 #define	USB_PRODUCT_SIERRA_AC313U	0x68aa		/* Sierra Wireless AirCard 313U */
 #define	USB_PRODUCT_SIERRA_TRUINSTALL	0x0fff		/* Aircard Tru Installer */
 
@@ -4218,6 +4241,7 @@
 #define	USB_PRODUCT_SITECOMEU_RTL8188CU_2	0x005c		/* RTL8188CU */
 #define	USB_PRODUCT_SITECOMEU_RTL8192CU	0x0061		/* RTL8192CU */
 #define	USB_PRODUCT_SITECOMEU_LN032	0x0072		/* LN-032 */
+#define	USB_PRODUCT_SITECOMEU_WLA7100	0x0074		/* WLA-7100 */
 #define	USB_PRODUCT_SITECOMEU_LN031	0x0056		/* LN-031 */
 #define	USB_PRODUCT_SITECOMEU_LN028	0x061c		/* LN-028 */
 #define	USB_PRODUCT_SITECOMEU_WL113	0x9071		/* WL-113 */
@@ -4461,6 +4485,10 @@
 #define	USB_PRODUCT_TOSHIBA_HSDPA	0x1302		/* G450 modem */
 #define	USB_PRODUCT_TOSHIBA_TRANSMEMORY	0x6545		/* USB ThumbDrive */
 
+/* TP-Link products */
+#define	USB_PRODUCT_TPLINK_T4U	0x0101		/* Archer T4U */
+#define	USB_PRODUCT_TPLINK_WN823NV2	0x0109		/* TL-WN823N v2 */
+
 /* Trek Technology products */
 #define	USB_PRODUCT_TREK_THUMBDRIVE	0x1111		/* ThumbDrive */
 #define	USB_PRODUCT_TREK_MEMKEY	0x8888		/* IBM USB Memory Key */
@@ -4470,6 +4498,7 @@
 #define	USB_PRODUCT_TRENDNET_RTL8192CU	0x624d		/* RTL8192CU */
 #define	USB_PRODUCT_TRENDNET_TEW646UBH	0x646b		/* TEW-646UBH */
 #define	USB_PRODUCT_TRENDNET_RTL8188CU	0x648b		/* RTL8188CU */
+#define	USB_PRODUCT_TRENDNET_TEW805UB	0x805b		/* TEW-805UB */
 
 /* Tripp-Lite products */
 #define	USB_PRODUCT_TRIPPLITE_U209	0x2008		/* Serial */
@@ -4713,3 +4742,4 @@
 #define	USB_PRODUCT_ZYXEL_RT3070	0x341e		/* NWD2105 */
 #define	USB_PRODUCT_ZYXEL_RTL8192CU	0x341f		/* RTL8192CU */
 #define	USB_PRODUCT_ZYXEL_NWD2705	0x3421		/* NWD2705 */
+#define	USB_PRODUCT_ZYXEL_NWD6605	0x3426		/* NWD6605 */
diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
index d4712da6..5936c8ca 100644
--- a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
+++ b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
@@ -1780,6 +1780,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB-AC51",
 	},
 	{
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_USBAC56,
+	    0,
+	    "ASUSTeK Computer",
+	    "USB-AC56",
+	},
+	{
 	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_A730W,
 	    0,
 	    "ASUSTeK Computer",
@@ -1927,7 +1933,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_UHB124,
 	    0,
 	    "Atmel",
-	    "UHB124 hub",
+	    "AT43301 USB 1.1 Hub",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL120,
@@ -2752,6 +2758,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "AE1000",
 	},
 	{
+	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB6300,
+	    0,
+	    "Cisco-Linksys",
+	    "WUSB6300",
+	},
+	{
 	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_USB3GIGV1,
 	    0,
 	    "Cisco-Linksys",
@@ -3550,6 +3562,36 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DWL-120 rev E",
 	},
 	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RTL8192CU_1,
+	    0,
+	    "D-Link",
+	    "RTL8192CU",
+	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RTL8188CU,
+	    0,
+	    "D-Link",
+	    "RTL8188CU",
+	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RTL8192CU_2,
+	    0,
+	    "D-Link",
+	    "RTL8192CU",
+	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RTL8192CU_3,
+	    0,
+	    "D-Link",
+	    "RTL8192CU",
+	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA131B,
+	    0,
+	    "D-Link",
+	    "DWA-131 rev B",
+	},
+	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA125D1,
 	    0,
 	    "D-Link",
@@ -3562,6 +3604,36 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DWA-123 rev D1",
 	},
 	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA171A1,
+	    0,
+	    "D-Link",
+	    "DWA-171 rev A1",
+	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA182C1,
+	    0,
+	    "D-Link",
+	    "DWA-182 rev C1",
+	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA180A1,
+	    0,
+	    "D-Link",
+	    "DWA-180 rev A1",
+	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA172A1,
+	    0,
+	    "D-Link",
+	    "DWA-172 rev A1",
+	},
+	{
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA131E1,
+	    0,
+	    "D-Link",
+	    "DWA-131 rev E1",
+	},
+	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL122,
 	    0,
 	    "D-Link",
@@ -3712,22 +3784,10 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "10/100/1000 Ethernet",
 	},
 	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650,
-	    0,
-	    "D-Link",
-	    "10/100 Ethernet",
-	},
-	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBH7,
-	    0,
-	    "D-Link",
-	    "DUB-H7 USB 2.0 7-Port Hub",
-	},
-	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWR510_CD,
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWM157,
 	    0,
 	    "D-Link",
-	    "DWR-510 CD-ROM Mode",
+	    "DWM-157",
 	},
 	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWR510,
@@ -3736,46 +3796,28 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DWR-510",
 	},
 	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWM157,
-	    0,
-	    "D-Link",
-	    "DWM-157",
-	},
-	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWM157_CD,
 	    0,
 	    "D-Link",
 	    "DWM-157 CD-ROM Mode",
 	},
 	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RTL8188CU,
-	    0,
-	    "D-Link",
-	    "RTL8188CU",
-	},
-	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RTL8192CU_1,
-	    0,
-	    "D-Link",
-	    "RTL8192CU",
-	},
-	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RTL8192CU_2,
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWR510_CD,
 	    0,
 	    "D-Link",
-	    "RTL8192CU",
+	    "DWR-510 CD-ROM Mode",
 	},
 	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_RTL8192CU_3,
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650,
 	    0,
 	    "D-Link",
-	    "RTL8192CU",
+	    "10/100 Ethernet",
 	},
 	{
-	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWA131B,
+	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBH7,
 	    0,
 	    "D-Link",
-	    "DWA-131 rev B",
+	    "DUB-H7 USB 2.0 7-Port Hub",
 	},
 	{
 	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RTL8192SU_1,
@@ -3838,16 +3880,16 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DWA-111",
 	},
 	{
-	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT2870_1,
+	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA110,
 	    0,
 	    "D-Link",
-	    "RT2870",
+	    "DWA-110",
 	},
 	{
-	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA110,
+	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT2870_1,
 	    0,
 	    "D-Link",
-	    "DWA-110",
+	    "RT2870",
 	},
 	{
 	    USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_RT3072,
@@ -4174,6 +4216,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RTL8192CU",
 	},
 	{
+	    USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_EW7811UTC_1,
+	    0,
+	    "Edimax",
+	    "EW-7811UTC",
+	},
+	{
+	    USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_EW7811UTC_2,
+	    0,
+	    "Edimax",
+	    "EW-7811UTC",
+	},
+	{
+	    USB_VENDOR_EDIMAX, USB_PRODUCT_EDIMAX_EW7822UAC,
+	    0,
+	    "Edimax",
+	    "EW-7822UAC",
+	},
+	{
 	    USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL,
 	    0,
 	    "eGalax, Inc.",
@@ -6277,7 +6337,13 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL606,
 	    0,
 	    "Genesys Logic",
-	    "USB 2.0 HUB",
+	    "GL606 USB 2.0 HUB",
+	},
+	{
+	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL850G,
+	    0,
+	    "Genesys Logic",
+	    "GL850G USB 2.0 HUB",
 	},
 	{
 	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB,
@@ -6646,6 +6712,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RTL8192SU",
 	},
 	{
+	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_HD65U,
+	    0,
+	    "Hawking",
+	    "HD65U",
+	},
+	{
 	    USB_VENDOR_HIDGLOBAL, USB_PRODUCT_HIDGLOBAL_CM2020,
 	    0,
 	    "HID Global",
@@ -7528,6 +7600,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "LTE modem",
 	},
 	{
+	    USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_ME909S,
+	    0,
+	    "Huawei Technologies",
+	    "LTE modem",
+	},
+	{
 	    USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_ETS2055,
 	    0,
 	    "Huawei Technologies",
@@ -7858,6 +7936,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RT3072",
 	},
 	{
+	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_WNAC867U,
+	    0,
+	    "I-O Data",
+	    "WN-AC867U",
+	},
+	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ,
 	    0,
 	    "I-O Data",
@@ -10618,6 +10702,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "WLI-UC-GNM2",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WIU2433DM,
+	    0,
+	    "Melco",
+	    "WI-U2-433DM",
+	},
+	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WIU3866D,
+	    0,
+	    "Melco",
+	    "WI-U3-866D",
+	},
+	{
 	    USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620,
 	    0,
 	    "Merlin",
@@ -11368,6 +11464,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "WL300NU-G",
 	},
 	{
+	    USB_VENDOR_NEC, USB_PRODUCT_NEC_WL900U,
+	    0,
+	    "NEC",
+	    "Aterm WL900U",
+	},
+	{
 	    USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB,
 	    0,
 	    "NEC",
@@ -11542,6 +11644,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "WNA1000M",
 	},
 	{
+	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_A6100,
+	    0,
+	    "BayNETGEAR",
+	    "A6100",
+	},
+	{
 	    USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101,
 	    0,
 	    "Netgear",
@@ -12802,6 +12910,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "MZK-UE150N",
 	},
 	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW900D,
+	    0,
+	    "Planex Communications",
+	    "GW-900D",
+	},
+	{
 	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54MINI2,
 	    0,
 	    "Planex Communications",
@@ -14044,6 +14158,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RTL8188CU",
 	},
 	{
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8192CU_1,
+	    0,
+	    "Realtek",
+	    "RTL8192CU",
+	},
+	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188EU,
 	    0,
 	    "Realtek",
@@ -14806,6 +14926,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "FTDI compatible adapter",
 	},
 	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_EUB1200AC,
+	    0,
+	    "Senao",
+	    "EnGenius EUB1200AC",
+	},
+	{
 	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT2870_3,
 	    0,
 	    "Senao",
@@ -15448,6 +15574,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "MC7355",
 	},
 	{
+	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC7430,
+	    0,
+	    "Sierra Wireless",
+	    "Sierra Wireless MC7430 Qualcomm Snapdragon X7 LTE-A",
+	},
+	{
 	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC313U,
 	    0,
 	    "Sierra Wireless",
@@ -16120,6 +16252,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "LN-032",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WLA7100,
+	    0,
+	    "Sitecom Europe",
+	    "WLA-7100",
+	},
+	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_LN031,
 	    0,
 	    "Sitecom Europe",
@@ -17038,6 +17176,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB ThumbDrive",
 	},
 	{
+	    USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_T4U,
+	    0,
+	    "TP-Link",
+	    "Archer T4U",
+	},
+	{
+	    USB_VENDOR_TPLINK, USB_PRODUCT_TPLINK_WN823NV2,
+	    0,
+	    "TP-Link",
+	    "TL-WN823N v2",
+	},
+	{
 	    USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE,
 	    0,
 	    "Trek Technology",
@@ -17074,6 +17224,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RTL8188CU",
 	},
 	{
+	    USB_VENDOR_TRENDNET, USB_PRODUCT_TRENDNET_TEW805UB,
+	    0,
+	    "TRENDnet",
+	    "TEW-805UB",
+	},
+	{
 	    USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209,
 	    0,
 	    "Tripp-Lite",
@@ -17992,6 +18148,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "NWD2705",
 	},
 	{
+	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_NWD6605,
+	    0,
+	    "ZyXEL Communication",
+	    "NWD6605",
+	},
+	{
 	    USB_VENDOR_UNKNOWN1, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Unknown vendor",
@@ -22096,6 +22258,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_TPLINK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "TP-Link",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_WESTMOUNTAIN, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "West Mountain Radio",