>Number:         35113
>Category:       kern
>Synopsis:       Minor rum(4) fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    kern-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Nov 24 20:45:00 +0000 2006
>Originator:     Dave Huang
>Release:        NetBSD 4.99.3
>Organization:
Name: Dave Huang         |  Mammal, mammal / their names are called /
INet: khym@azeotrope.org |  they raise a paw / the bat, the cat /
FurryMUCK: Dahan         |  dolphin and dog / koala bear and hog -- TMBG
Dahan: Hani G Y+C 30 Y++ L+++ W- C++ T++ A+ E+ S++ V++ F- Q+++ P+ B+ PA+ PL++
>Environment:
	
	
System: NetBSD ia.azeotrope.org 4.99.4 NetBSD 4.99.4 (IA1) #1: Fri Nov 24 13:13:02 CST 2006  khym@vmbsd.azeotrope.org:/usr/obj.i386/sys/arch/i386/compile/IA1 i386
Architecture: i386
Machine: i386
>Description:
	The rum(4) manpage says that the driver supports the ASUS
WL-167g version 2, but mine has a USB vendor/product ID that's not
listed in the driver.

	Also, the driver autoconf definition doesn't pull in firmload,
so kernels without any other devices that need firmload won't link.

	And finally, the rum(4) manpage gives the wrong path to the
firmware file.

>How-To-Repeat:
	
>Fix:
Index: share/man/man4/rum.4
===================================================================
RCS file: /cvsroot/src/share/man/man4/rum.4,v
retrieving revision 1.2
diff -u -r1.2 rum.4
--- share/man/man4/rum.4	31 Oct 2006 22:49:01 -0000	1.2
+++ share/man/man4/rum.4	24 Nov 2006 19:08:41 -0000
@@ -215,7 +215,7 @@
 The following firmware file is loaded when an interface is brought up:
 .Pp
 .Bl -tag -width Ds -offset indent -compact
-.It /etc/firmware/rum-rt2573
+.It /libdata/firmware/rum/rum-rt2573
 .El
 .Sh HARDWARE
 The following adapters should work:
Index: sys/dev/usb/files.usb
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/files.usb,v
retrieving revision 1.72
diff -u -r1.72 files.usb
--- sys/dev/usb/files.usb	31 Oct 2006 22:21:17 -0000	1.72
+++ sys/dev/usb/files.usb	24 Nov 2006 19:11:14 -0000
@@ -259,7 +259,7 @@
 attach	ral at usbdevif with ural
 file	dev/usb/if_ural.c		ural
 
-device	rum: ether, ifnet, arp, wlan
+device	rum: ether, ifnet, arp, wlan, firmload
 attach	rum at usbdevif
 file	dev/usb/if_rum.c		rum
 
Index: sys/dev/usb/if_rum.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/if_rum.c,v
retrieving revision 1.2
diff -u -r1.2 if_rum.c
--- sys/dev/usb/if_rum.c	1 Nov 2006 08:39:25 -0000	1.2
+++ sys/dev/usb/if_rum.c	24 Nov 2006 19:11:16 -0000
@@ -89,6 +89,7 @@
 /* various supported device vendors/products */
 static const struct usb_devno rum_devs[] = {
 	{ USB_VENDOR_ABOCOM,		USB_PRODUCT_ABOCOM_RT2573 },
+	{ USB_VENDOR_ASUSTEK,		USB_PRODUCT_ASUSTEK_WL167G_2 },
 	{ USB_VENDOR_BELKIN,		USB_PRODUCT_BELKIN_F5D7050A },
 	{ USB_VENDOR_BELKIN,		USB_PRODUCT_BELKIN_F5D9050V3 },
 	{ USB_VENDOR_CISCOLINKSYS,	USB_PRODUCT_CISCOLINKSYS_WUSB54GC },
Index: sys/dev/usb/usbdevs
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usbdevs,v
retrieving revision 1.442
diff -u -r1.442 usbdevs
--- sys/dev/usb/usbdevs	22 Nov 2006 17:57:40 -0000	1.442
+++ sys/dev/usb/usbdevs	24 Nov 2006 19:11:19 -0000
@@ -626,6 +626,7 @@
 
 /* ASUSTeK computer products */
 product ASUSTEK WL167G		0x1707	WL-167g USB2.0 WLAN Adapter
+product ASUSTEK WL167G_2	0x1723	WL-167g USB2.0 WLAN Adapter (version 2)
 
 /* ATen products */
 product ATEN UC1284		0x2001	Parallel printer adapter

>Unformatted: