svn commit: r199911 - stable/7/sys/dev/mii

[Pyun YongHyeon]

Author: yongari
Date: Sun Nov 29 19:01:21 2009
New Revision: 199911
URL: http://svn.freebsd.org/changeset/base/199911

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

Modified:
  stable/7/sys/dev/mii/e1000phy.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/mii/e1000phy.c
==============================================================================
--- stable/7/sys/dev/mii/e1000phy.c	Sun Nov 29 18:59:43 2009	(r199910)
+++ stable/7/sys/dev/mii/e1000phy.c	Sun Nov 29 19:01:21 2009	(r199911)
@@ -247,7 +247,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: