svn commit: r199910 - stable/8/sys/dev/mii

[Pyun YongHyeon]

Author: yongari
Date: Sun Nov 29 18:59:43 2009
New Revision: 199910
URL: http://svn.freebsd.org/changeset/base/199910

Log:
  MFC 197587.
    Don't encode model id twice.
  
    Reported by:	Kristof Provost <kristof <> sigsegv dot be>

Modified:
  stable/8/sys/dev/mii/e1000phy.c
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	Sun Nov 29 18:54:21 2009	(r199909)
+++ stable/8/sys/dev/mii/e1000phy.c	Sun Nov 29 18:59:43 2009	(r199910)
@@ -248,7 +248,7 @@ e1000phy_reset(struct mii_softc *sc)
 		}
 	}
 
-	switch (MII_MODEL(esc->mii_model)) {
+	switch (esc->mii_model) {
 	case MII_MODEL_MARVELL_E3082:
 	case MII_MODEL_MARVELL_E1112:
 	case MII_MODEL_MARVELL_E1118: