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

[Pyun YongHyeon]

Author: yongari
Date: Sun Nov 29 19:03:20 2009
New Revision: 199912
URL: http://svn.freebsd.org/changeset/base/199912

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/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 19:01:21 2009	(r199911)
+++ stable/8/sys/dev/mii/e1000phy.c	Sun Nov 29 19:03:20 2009	(r199912)
@@ -485,8 +485,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)