From owner-svn-src-all@FreeBSD.ORG Sat Jun 25 18:53:21 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 412D6106564A; Sat, 25 Jun 2011 18:53:21 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe03.c2i.net [212.247.154.66]) by mx1.freebsd.org (Postfix) with ESMTP id ECF9B8FC18; Sat, 25 Jun 2011 18:53:19 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=EIZfbDsN8gr1c4B7uGrP4foh/gtfZ6zZRee2cLtKwTU= c=1 sm=1 a=SvYTsOw2Z4kA:10 a=vURWEZHBcHsA:10 a=WQU8e4WWZSUA:10 a=N659UExz7-8A:10 a=CL8lFSKtTFcA:10 a=i9M/sDlu2rpZ9XS819oYzg==:17 a=6I5d2MoRAAAA:8 a=Vps-brQPRbC3WPJlKagA:9 a=fQqhcABWXOeJUu3UN3kA:7 a=pILNOxqGKmIA:10 a=i9M/sDlu2rpZ9XS819oYzg==:117 Received: from [188.126.198.129] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe03.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 145270374; Sat, 25 Jun 2011 20:53:18 +0200 From: Hans Petter Selasky To: Gavin Atkinson Date: Sat, 25 Jun 2011 20:51:38 +0200 User-Agent: KMail/1.13.5 (FreeBSD/8.2-STABLE; KDE/4.4.5; amd64; ; ) References: <201106252043.59444.hselasky@c2i.net> In-Reply-To: <201106252043.59444.hselasky@c2i.net> X-Face: *nPdTl_}RuAI6^PVpA02T?$%Xa^>@hE0uyUIoiha$pC:9TVgl.Oq, NwSZ4V"|LR.+tj}g5 %V,x^qOs~mnU3]Gn; cQLv&.N>TrxmSFf+p6(30a/{)KUU!s}w\IhQBj}[g}bj0I3^glmC( :AuzV9:.hESm-x4h240C`9=w MIME-Version: 1.0 Content-Type: Text/Plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Message-Id: <201106252051.38956.hselasky@c2i.net> Cc: "svn-src-head@freebsd.org" , kevlo@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" Subject: Re: svn commit: r223537 - head/sys/dev/usb/wlan X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jun 2011 18:53:21 -0000 On Saturday 25 June 2011 20:43:59 Hans Petter Selasky wrote: > 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 Hi, I see a minor bug here: %grep -r ACCTON /sys/dev/usb/wlan/if_zyd.c ZYD_ZD1211B_DEV(ACCTON, SMCWUSBG_NF), ZYD_ZD1211B_DEV(ACCTON, SMCWUSBG), ZYD_ZD1211B_DEV(ACCTON, ZD1211B), %grep -r ACCTON /sys/dev/usb/wlan/if_uath.c UATH_DEV(ACCTON, SMCWUSBG), UATH_DEV(ACCTON, SMCWUSBTG2), Which one of these drivers support the SMCWUSBG ? --HPS