From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 12 21:38:49 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A785106566C;
	Wed, 12 Oct 2011 21:38:49 +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 49A628FC12;
	Wed, 12 Oct 2011 21:38:49 +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 p9CLcndr085301;
	Wed, 12 Oct 2011 21:38:49 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9CLcnI2085299;
	Wed, 12 Oct 2011 21:38:49 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201110122138.p9CLcnI2085299@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Wed, 12 Oct 2011 21:38:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226328 - stable/8/etc/devd
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Oct 2011 21:38:49 -0000

Author: gavin
Date: Wed Oct 12 21:38:48 2011
New Revision: 226328
URL: http://svn.freebsd.org/changeset/base/226328

Log:
  Merge r223566 from head:
  
    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 is a partial merge, as it appears that the kernel parts of r223566
  were already merged in r223605.
  
  Discussed with:	hselasky, kevlo

Modified:
  stable/8/etc/devd/uath.conf
Directory Properties:
  stable/8/etc/   (props changed)

Modified: stable/8/etc/devd/uath.conf
==============================================================================
--- stable/8/etc/devd/uath.conf	Wed Oct 12 21:06:54 2011	(r226327)
+++ stable/8/etc/devd/uath.conf	Wed Oct 12 21:38:48 2011	(r226328)
@@ -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";
 };