add some additional run(4)/urtwn(4) devices found in FreeBSD

5 files changed, 29 insertions, 13 deletions

diff --git a/share/man/man4/run.4 b/share/man/man4/run.4
index 6f2587b5c41..febb3871b78 100644
--- a/share/man/man4/run.4
+++ b/share/man/man4/run.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: run.4,v 1.41 2013/08/20 13:46:53 millert Exp $
+.\" $OpenBSD: run.4,v 1.42 2013/09/30 05:18:56 jsg Exp $
 .\"
 .\" Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 20 2013 $
+.Dd $Mdocdate: September 30 2013 $
 .Dt RUN 4
 .Os
 .Sh NAME
@@ -92,6 +92,7 @@ The following adapters should work:
 .It Airlink101 AWLL6090
 .It ASUS USB-N11
 .It ASUS USB-N13
+.It ASUS USB-N53
 .It ASUS WL-160N
 .It Belkin F5D8051 ver 3000
 .It Belkin F5D8053
@@ -105,11 +106,13 @@ The following adapters should work:
 .It Buffalo WLI-UC-GN
 .It Buffalo WLI-UC-GNHP
 .It Buffalo WLI-UC-GNM
+.It Buffalo WLI-UC-GNM2
 .It Cisco AM10
 .It Corega CG-WLUSB2GNL
 .It Corega CG-WLUSB2GNR
 .It Corega CG-WLUSB300AGN
 .It Corega CG-WLUSB300GNM
+.It D-Link DWA-127
 .It D-Link DWA-130 rev B1
 .It D-Link DWA-140
 .It DrayTek Vigor N61
@@ -131,7 +134,9 @@ The following adapters should work:
 .It Linksys WUSB54GC v3
 .It Linksys WUSB600N
 .It Logitec gLAN-W150NU2BK
+.It Logitec LAN-W150N/U2
 .It Logitec LAN-W300N/U2
+.It Logitec LAN-W300N/U2S
 .It Mvix Nubbin MS-811N
 .It Planex GW-USMicroN
 .It Planex GW-US300MiniS
diff --git a/share/man/man4/urtwn.4 b/share/man/man4/urtwn.4
index 522505f50b9..7f374cac8b2 100644
--- a/share/man/man4/urtwn.4
+++ b/share/man/man4/urtwn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: urtwn.4,v 1.25 2013/09/14 17:40:01 jmc Exp $
+.\" $OpenBSD: urtwn.4,v 1.26 2013/09/30 05:18:56 jsg Exp $
 .\"
 .\" Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 14 2013 $
+.Dd $Mdocdate: September 30 2013 $
 .Dt URTWN 4
 .Os
 .Sh NAME
@@ -97,6 +97,7 @@ The following adapters should work:
 .It B-Link BL-LW05-5R
 .It Belkin F7D1102 Surf Wireless Micro
 .It D-Link DWA-121
+.It D-Link DWA-131 rev B
 .It D-Link DWA-133
 .It D-Link DWA-135
 .It Digitus DN-7042
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 55eadf07afb..caf9920d3bb 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_run.c,v 1.94 2013/08/07 01:06:42 bluhm Exp $	*/
+/*	$OpenBSD: if_run.c,v 1.95 2013/09/30 05:18:56 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -116,8 +116,9 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(ASUS,		RT2870_3),
 	USB_ID(ASUS,		RT2870_4),
 	USB_ID(ASUS,		RT2870_5),
-	USB_ID(ASUS,		RT3070),
 	USB_ID(ASUS,		RT3070_1),
+	USB_ID(ASUS,		USBN13),
+	USB_ID(ASUS,		USBN53),
 	USB_ID(ASUS2,		USBN11),
 	USB_ID(AZUREWAVE,	RT2870_1),
 	USB_ID(AZUREWAVE,	RT2870_2),
@@ -157,6 +158,7 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(COREGA,		RT2870_3),
 	USB_ID(COREGA,		RT3070),
 	USB_ID(CYBERTAN,	RT2870),
+	USB_ID(DLINK,		DWA127),
 	USB_ID(DLINK,		RT2870),
 	USB_ID(DLINK,		RT3072),
 	USB_ID(DLINK2,		DWA130),
@@ -199,11 +201,12 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(LINKSYS4,	WUSB54GCV3),
 	USB_ID(LINKSYS4,	WUSB600N),
 	USB_ID(LINKSYS4,	WUSB600NV2),
+	USB_ID(LOGITEC,		LANW150NU2),
 	USB_ID(LOGITEC,		LANW300NU2),
+	USB_ID(LOGITEC,		LANW300NU2S),
 	USB_ID(LOGITEC,		RT2870_1),
 	USB_ID(LOGITEC,		RT2870_2),
 	USB_ID(LOGITEC,		RT2870_3),
-	USB_ID(LOGITEC,		RT3020),
 	USB_ID(MELCO,		RT2870_1),
 	USB_ID(MELCO,		RT2870_2),
 	USB_ID(MELCO,		WLIUCAG300N),
@@ -212,6 +215,7 @@ static const struct usb_devno run_devs[] = {
 	USB_ID(MELCO,		WLIUCGN),
 	USB_ID(MELCO,		WLIUCGNHP),
 	USB_ID(MELCO,		WLIUCGNM),
+	USB_ID(MELCO,		WLIUCGNM2),
 	USB_ID(MOTOROLA4,	RT2770),
 	USB_ID(MOTOROLA4,	RT3070),
 	USB_ID(MSI,		RT3070_1),
diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c
index 1bb7a7aa9f2..d1990ad46cb 100644
--- a/sys/dev/usb/if_urtwn.c
+++ b/sys/dev/usb/if_urtwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtwn.c,v 1.31 2013/09/30 03:59:56 jsg Exp $	*/
+/*	$OpenBSD: if_urtwn.c,v 1.32 2013/09/30 05:18:57 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -97,12 +97,13 @@ static const struct usb_devno urtwn_devs[] = {
 	{ USB_VENDOR_CHICONY,	USB_PRODUCT_CHICONY_RTL8188CUS_6 },
 	{ USB_VENDOR_COMPARE,	USB_PRODUCT_COMPARE_RTL8192CU },
 	{ USB_VENDOR_COREGA,	USB_PRODUCT_COREGA_RTL8192CU },
+	{ USB_VENDOR_DLINK,	USB_PRODUCT_DLINK_DWA131B },
 	{ USB_VENDOR_DLINK,	USB_PRODUCT_DLINK_RTL8188CU },
 	{ USB_VENDOR_DLINK,	USB_PRODUCT_DLINK_RTL8192CU_1 },
 	{ USB_VENDOR_DLINK,	USB_PRODUCT_DLINK_RTL8192CU_2 },
 	{ USB_VENDOR_DLINK,	USB_PRODUCT_DLINK_RTL8192CU_3 },
 	{ USB_VENDOR_DLINK,	USB_PRODUCT_DLINK_RTL8192CU_4 },
-	{ USB_VENDOR_EDIMAX,	USB_PRODUCT_EDIMAX_RTL8188CU },
+	{ USB_VENDOR_EDIMAX,	USB_PRODUCT_EDIMAX_EW7811UN },
 	{ USB_VENDOR_EDIMAX,	USB_PRODUCT_EDIMAX_RTL8192CU },
 	{ USB_VENDOR_FEIXUN,	USB_PRODUCT_FEIXUN_RTL8188CU },
 	{ USB_VENDOR_FEIXUN,	USB_PRODUCT_FEIXUN_RTL8192CU },
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index fc0f3e20614..acbf418bcad 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.606 2013/09/30 03:55:46 jsg Exp $
+$OpenBSD: usbdevs,v 1.607 2013/09/30 05:16:24 jsg Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -970,10 +970,11 @@ product ASUS RT2870_2		0x1732	RT2870
 product ASUS RT2870_3		0x1742	RT2870
 product ASUS RT2870_4		0x1760	RT2870
 product ASUS RT2870_5		0x1761	RT2870
-product ASUS RT3070		0x1784	RT3070
+product ASUS USBN13		0x1784	USB-N13
 product ASUS USBN10		0x1786	USB-N10
 product ASUS RT3070_1		0x1790	RT3070
 product ASUS RTL8192SU_1	0x1791	RTL8192SU
+product ASUS USBN53		0x179d	USB-N53
 product ASUS RTL8192CU		0x17ab	RTL8192CU
 product ASUS RTL8192CU_2	0x17ba	RTL8192CU
 product ASUS RTL8192CU_3	0x17c0	RTL8192CU
@@ -1444,6 +1445,7 @@ product DLINK RTL8188CU		0x3308	RTL8188CU
 product DLINK RTL8192CU_2	0x3309	RTL8192CU
 product DLINK RTL8192CU_3	0x330a	RTL8192CU
 product DLINK RTL8192CU_4	0x330b	RTL8192CU
+product DLINK DWA131B		0x330d	DWA-131 rev B
 product DLINK DWL122		0x3700	DWL-122
 product DLINK DWLG120		0x3701	DWL-G120
 product DLINK DWL120F		0x3702	DWL-120 rev F
@@ -1458,6 +1460,7 @@ product DLINK RT2570		0x3c00	RT2570
 product DLINK DUBE100B1		0x3c05	DUB-E100 rev B1
 product DLINK RT2870		0x3c09	RT2870
 product DLINK RT3072		0x3c0a	RT3072
+product DLINK DWA127		0x3c1b	DWA-127
 product DLINK DSB650C		0x4000	10Mbps Ethernet
 product DLINK DSB650TX1		0x4001	10/100 Ethernet
 product DLINK DSB650TX		0x4002	10/100 Ethernet
@@ -1550,7 +1553,7 @@ product EDIMAX RT2870_1		0x7711	RT2870
 product EDIMAX EW7717		0x7717	EW-7717
 product EDIMAX EW7718		0x7718	EW-7718
 product EDIMAX EW7722UTN	0x7722	EW-7722UTn
-product EDIMAX RTL8188CU	0x7811	RTL8188CU
+product EDIMAX EW7811UN		0x7811	EW-7811Un
 product EDIMAX RTL8192CU	0x7822	RTL8192CU
 
 /* eGalax Products */
@@ -2408,7 +2411,8 @@ product LOGITEC RT2870_1	0x0162	RT2870
 product LOGITEC RT2870_2	0x0163	RT2870
 product LOGITEC RT2870_3	0x0164	RT2870
 product LOGITEC LANW300NU2	0x0166	LAN-W300N/U2
-product LOGITEC RT3020		0x0168	RT3020
+product LOGITEC LANW150NU2	0x0168	LAN-W150N/U2
+product LOGITEC LANW300NU2S	0x0169	LAN-W300N/U2S
 
 /* Logitech products */
 product LOGITECH M2452		0x0203	M2452 keyboard
@@ -2784,6 +2788,7 @@ product MELCO WLIUCGNHP		0x0158	WLI-UC-GNHP
 product MELCO WLIUCGN		0x015d	WLI-UC-GN
 product MELCO WLIUCG301N	0x016f	WLI-UC-G301N
 product MELCO WLIUCGNM		0x01a2	WLI-UC-GNM
+product MELCO WLIUCGNM2		0x01ee	WLI-UC-GNM2
 
 /* MetaGeek tagged products */
 product MECANIQUE WISPY		0x083e	MetaGeek Wi-Spy