Date: Sat, 25 Jun 2011 20:43:59 +0200 From: Hans Petter Selasky <hselasky@c2i.net> To: Gavin Atkinson <gavin@freebsd.org> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org> Subject: Re: svn commit: r223537 - head/sys/dev/usb/wlan Message-ID: <201106252043.59444.hselasky@c2i.net>
next in thread | raw e-mail | index | archive | help
On Saturday 25 June 2011 20:26:19 Gavin Atkinson wrote: > On Sat, 25 Jun 2011, Hans Petter Selasky wrote: > > Author: hselasky > > Date: Sat Jun 25 15:46:24 2011 > > New Revision: 223537 > > URL: http://svn.freebsd.org/changeset/base/223537 > > > > Log: > > - Remove duplicate USB ID. > > Are you sure? > > > Modified: > > head/sys/dev/usb/wlan/if_zyd.c > > > > Modified: head/sys/dev/usb/wlan/if_zyd.c > > ========================================================================= > > ===== --- head/sys/dev/usb/wlan/if_zyd.c Sat Jun 25 15:42:33 > > 2011 (r223536) +++ head/sys/dev/usb/wlan/if_zyd.c Sat Jun 25 15:46:24 > > 2011 (r223537) @@ -229,7 +229,6 @@ static const STRUCT_USB_HOST_ID > > zyd_devs > > > > ZYD_ZD1211_DEV(ZYXEL, ZYAIRG220), > > ZYD_ZD1211_DEV(ZYXEL, G200V2), > > /* ZYD_ZD1211B */ > > > > - ZYD_ZD1211B_DEV(ACCTON, SMCWUSBG_NF), > > > > ZYD_ZD1211B_DEV(ACCTON, SMCWUSBG), > > ZYD_ZD1211B_DEV(ACCTON, ZD1211B), > > ZYD_ZD1211B_DEV(ASUS, A9T_WIFI), > > gavin@psi:/home/gavin 110% grep SMCWUSBG > /usr/freebsd/head/sys/dev/usb/usbdevs > product ACCTON SMCWUSBG_NF 0x4505 SMCWUSB-G (no firmware) > product ACCTON SMCWUSBG 0x4506 SMCWUSB-G > > This SMCWUSBG_NF ID was only added three months ago, in r219982. The > other ID has been in the driver since it was first committed. > > Gavin Hi, vendor ACCTON 0x083a Accton Technology If I'm not mistaken, this ID is supposed to be handled by uath.conf, see below. http://svnweb.freebsd.org/base/head/etc/devd/uath.conf?revision=207020&view=markup 5 # Accton 6 # SMCWUSB-G and SMCWUSBT-G2 7 notify 100 { 8 match "system" "USB"; 9 match "subsystem" "DEVICE"; 10 match "type" "ATTACH"; 11 match "vendor" "0x083a"; 12 match "product" "(0x4505|0x4507)"; 13 action "/usr/sbin/uathload -d /dev/$cdev"; 14 }; I think not both of if_zyd and uath.conf should handle this ID. Correct me if I'm wrong. According to the other entries, only the no-firmware ones are supposed to be listed in uath.conf, while the firmware ones in xxx.ko. --HPS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106252043.59444.hselasky>