svn commit: r281878 - in stable/10: share/man/man4 sys/dev/usb sys/dev/usb/wlan

[Kevin Lo]

Author: kevlo
Date: Thu Apr 23 01:52:07 2015
New Revision: 281878
URL: https://svnweb.freebsd.org/changeset/base/281878

Log:
  MFC r281745:
  Add new USB ID.
  
  PR:	199522

Modified:
  stable/10/share/man/man4/run.4
  stable/10/sys/dev/usb/usbdevs
  stable/10/sys/dev/usb/wlan/if_run.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man4/run.4
==============================================================================
--- stable/10/share/man/man4/run.4	Thu Apr 23 01:39:28 2015	(r281877)
+++ stable/10/share/man/man4/run.4	Thu Apr 23 01:52:07 2015	(r281878)
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 3, 2014
+.Dd April 19, 2015
 .Dt RUN 4
 .Os
 .Sh NAME
@@ -133,6 +133,7 @@ driver supports the following wireless a
 .It Belkin F6D4050 ver 1
 .It Belkin F9L1103
 .It Buffalo WLI-UC-AG300N
+.It Buffalo WLI-UC-G300HP
 .It Buffalo WLI-UC-G300N
 .It Buffalo WLI-UC-G301N
 .It Buffalo WLI-UC-GN

Modified: stable/10/sys/dev/usb/usbdevs
==============================================================================
--- stable/10/sys/dev/usb/usbdevs	Thu Apr 23 01:39:28 2015	(r281877)
+++ stable/10/sys/dev/usb/usbdevs	Thu Apr 23 01:52:07 2015	(r281878)
@@ -2991,11 +2991,12 @@ product MELCO WLRUCG		0x0116	WLR-UC-G
 product MELCO WLRUCGAOSS	0x0119	WLR-UC-G-AOSS
 product MELCO WLIUCAG300N	0x012e	WLI-UC-AG300N
 product MELCO WLIUCG		0x0137	WLI-UC-G
-product MELCO RT2870_1		0x0148	RT2870
+product MELCO WLIUCG300HP	0x0148	WLI-UC-G300HP
 product MELCO RT2870_2		0x0150	RT2870
 product MELCO WLIUCGN		0x015d	WLI-UC-GN
 product MELCO WLIUCG301N	0x016f	WLI-UC-G301N
 product MELCO WLIUCGNM		0x01a2	WLI-UC-GNM
+product MELCO WLIUCG300HPV1	0x01a8	WLI-UC-G300HP-V1
 product MELCO WLIUCGNM2		0x01ee	WLI-UC-GNM2
 
 /* Merlin products */

Modified: stable/10/sys/dev/usb/wlan/if_run.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_run.c	Thu Apr 23 01:39:28 2015	(r281877)
+++ stable/10/sys/dev/usb/wlan/if_run.c	Thu Apr 23 01:52:07 2015	(r281878)
@@ -224,13 +224,14 @@ static const STRUCT_USB_HOST_ID run_devs
     RUN_DEV(LOGITEC,		LANW300NU2),
     RUN_DEV(LOGITEC,		LANW150NU2),
     RUN_DEV(LOGITEC,		LANW300NU2S),
-    RUN_DEV(MELCO,		RT2870_1),
+    RUN_DEV(MELCO,		WLIUCG300HP),
     RUN_DEV(MELCO,		RT2870_2),
     RUN_DEV(MELCO,		WLIUCAG300N),
     RUN_DEV(MELCO,		WLIUCG300N),
     RUN_DEV(MELCO,		WLIUCG301N),
     RUN_DEV(MELCO,		WLIUCGN),
     RUN_DEV(MELCO,		WLIUCGNM),
+    RUN_DEV(MELCO,		WLIUCG300HPV1),
     RUN_DEV(MELCO,		WLIUCGNM2),
     RUN_DEV(MOTOROLA4,		RT2770),
     RUN_DEV(MOTOROLA4,		RT3070),