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

[Pyun YongHyeon]

Author: yongari
Date: Sun Nov 29 19:04:42 2009
New Revision: 199913
URL: http://svn.freebsd.org/changeset/base/199913

Log:
  MFC 197588.
    Some fiber PHY(88E1112) does not seem to set resolved speed so
    always assume we've got IFM_1000_SX.

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 19:03:20 2009	(r199912)
+++ stable/7/sys/dev/mii/e1000phy.c	Sun Nov 29 19:04:42 2009	(r199913)
@@ -484,8 +484,11 @@ e1000phy_status(struct mii_softc *sc)
 			return;
 		}
 	} else {
-		if (ssr & E1000_SSR_1000MBS)
-			mii->mii_media_active |= IFM_1000_SX;
+		/*
+		 * Some fiber PHY(88E1112) does not seem to set resolved
+		 * speed so always assume we've got IFM_1000_SX.
+		 */
+		mii->mii_media_active |= IFM_1000_SX;
 	}
 
 	if (ssr & E1000_SSR_DUPLEX)