svn commit: r212016 - stable/7/sys/dev/mii
Pyun YongHyeon
yongari at FreeBSD.org
Mon Aug 30 21:00:38 UTC 2010
Author: yongari
Date: Mon Aug 30 21:00:37 2010
New Revision: 212016
URL: http://svn.freebsd.org/changeset/base/212016
Log:
MFC r211046:
Marvell model number 0x06 is 88E1101 PHY.
Modified:
stable/7/sys/dev/mii/e1000phy.c
stable/7/sys/dev/mii/miidevs
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/mii/e1000phy.c
==============================================================================
--- stable/7/sys/dev/mii/e1000phy.c Mon Aug 30 20:59:13 2010 (r212015)
+++ stable/7/sys/dev/mii/e1000phy.c Mon Aug 30 21:00:37 2010 (r212016)
@@ -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/7/sys/dev/mii/miidevs
==============================================================================
--- stable/7/sys/dev/mii/miidevs Mon Aug 30 20:59:13 2010 (r212015)
+++ stable/7/sys/dev/mii/miidevs Mon Aug 30 21:00:37 2010 (r212016)
@@ -235,7 +235,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
More information about the svn-src-stable-7
mailing list