From owner-svn-src-all@FreeBSD.ORG  Mon Aug 30 20:59:14 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 436091065693;
	Mon, 30 Aug 2010 20:59:14 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 326EF8FC1D;
	Mon, 30 Aug 2010 20:59:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7UKxEj8006847;
	Mon, 30 Aug 2010 20:59:14 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7UKxEKo006844;
	Mon, 30 Aug 2010 20:59:14 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201008302059.o7UKxEKo006844@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Mon, 30 Aug 2010 20:59:14 +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: r212015 - stable/8/sys/dev/mii
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Aug 2010 20:59:14 -0000

Author: yongari
Date: Mon Aug 30 20:59:13 2010
New Revision: 212015
URL: http://svn.freebsd.org/changeset/base/212015

Log:
  MFC r211046:
    Marvell model number 0x06 is 88E1101 PHY.

Modified:
  stable/8/sys/dev/mii/e1000phy.c
  stable/8/sys/dev/mii/miidevs
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/mii/e1000phy.c
==============================================================================
--- stable/8/sys/dev/mii/e1000phy.c	Mon Aug 30 20:56:59 2010	(r212014)
+++ stable/8/sys/dev/mii/e1000phy.c	Mon Aug 30 20:59:13 2010	(r212015)
@@ -103,7 +103,7 @@ static const struct mii_phydesc e1000phy
 	MII_PHY_DESC(MARVELL, E1000_3),
 	MII_PHY_DESC(MARVELL, E1000S),
 	MII_PHY_DESC(MARVELL, E1000_5),
-	MII_PHY_DESC(MARVELL, E1000_6),
+	MII_PHY_DESC(MARVELL, E1101),
 	MII_PHY_DESC(MARVELL, E3082),
 	MII_PHY_DESC(MARVELL, E1112),
 	MII_PHY_DESC(MARVELL, E1149),

Modified: stable/8/sys/dev/mii/miidevs
==============================================================================
--- stable/8/sys/dev/mii/miidevs	Mon Aug 30 20:56:59 2010	(r212014)
+++ stable/8/sys/dev/mii/miidevs	Mon Aug 30 20:59:13 2010	(r212015)
@@ -245,7 +245,7 @@ model MARVELL E1011		0x0002 Marvell 88E1
 model MARVELL E1000_3		0x0003 Marvell 88E1000 Gigabit PHY
 model MARVELL E1000S		0x0004 Marvell 88E1000S Gigabit PHY
 model MARVELL E1000_5		0x0005 Marvell 88E1000 Gigabit PHY
-model MARVELL E1000_6		0x0006 Marvell 88E1000 Gigabit PHY
+model MARVELL E1101		0x0006 Marvell 88E1101 Gigabit PHY
 model MARVELL E3082		0x0008 Marvell 88E3082 10/100 Fast Ethernet PHY
 model MARVELL E1112		0x0009 Marvell 88E1112 Gigabit PHY
 model MARVELL E1149		0x000b Marvell 88E1149 Gigabit PHY