From owner-svn-src-all@FreeBSD.ORG Sun Jun 26 11:37:25 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 56C3E10656D9; Sun, 26 Jun 2011 11:37:25 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2CC418FC17; Sun, 26 Jun 2011 11:37:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5QBbPnP051313; Sun, 26 Jun 2011 11:37:25 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5QBbPOi051309; Sun, 26 Jun 2011 11:37:25 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201106261137.p5QBbPOi051309@svn.freebsd.org> From: Gavin Atkinson Date: Sun, 26 Jun 2011 11:37:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223566 - in head: etc/devd 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: Sun, 26 Jun 2011 11:37:25 -0000 Author: gavin Date: Sun Jun 26 11:37:24 2011 New Revision: 223566 URL: http://svn.freebsd.org/changeset/base/223566 Log: The SMCWUSBG is a zyd(4) device, not an uath(4) device. Remove from the latter. It appears that the addition to uath(4) came in through PR kern/135009, which had tested another device, the SMCWUSBTG2, successfully with uath(4) and included the SMCWUSBG as it "has the same chipset". I can find no other evidence that these two do actually share the same chipset. Moreover, Linux treats the SMCWUSBG as a zyd(4) device also. This reverts r223537. Discussed with: hselasky, kevlo MFC after: 1 week Modified: head/etc/devd/uath.conf head/sys/dev/usb/wlan/if_uath.c head/sys/dev/usb/wlan/if_zyd.c Modified: head/etc/devd/uath.conf ============================================================================== --- head/etc/devd/uath.conf Sun Jun 26 10:50:11 2011 (r223565) +++ head/etc/devd/uath.conf Sun Jun 26 11:37:24 2011 (r223566) @@ -3,13 +3,13 @@ # Atheros USB wireless network device specific devd events # Accton -# SMCWUSB-G and SMCWUSBT-G2 +# SMCWUSBT-G2 notify 100 { match "system" "USB"; match "subsystem" "DEVICE"; match "type" "ATTACH"; match "vendor" "0x083a"; - match "product" "(0x4505|0x4507)"; + match "product" "0x4507"; action "/usr/sbin/uathload -d /dev/$cdev"; }; Modified: head/sys/dev/usb/wlan/if_uath.c ============================================================================== --- head/sys/dev/usb/wlan/if_uath.c Sun Jun 26 10:50:11 2011 (r223565) +++ head/sys/dev/usb/wlan/if_uath.c Sun Jun 26 11:37:24 2011 (r223566) @@ -169,7 +169,6 @@ enum { /* recognized device vendors/products */ static const STRUCT_USB_HOST_ID uath_devs[] = { #define UATH_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) } - UATH_DEV(ACCTON, SMCWUSBG), UATH_DEV(ACCTON, SMCWUSBTG2), UATH_DEV(ATHEROS, AR5523), UATH_DEV(ATHEROS2, AR5523_1), Modified: head/sys/dev/usb/wlan/if_zyd.c ============================================================================== --- head/sys/dev/usb/wlan/if_zyd.c Sun Jun 26 10:50:11 2011 (r223565) +++ head/sys/dev/usb/wlan/if_zyd.c Sun Jun 26 11:37:24 2011 (r223566) @@ -229,6 +229,7 @@ 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),