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

[Pyun YongHyeon]

Author: yongari
Date: Sun Aug 15 23:26:46 2010
New Revision: 211379
URL: http://svn.freebsd.org/changeset/base/211379

Log:
  MFC r207391:
    - Pass flow control settings back to bce(4).

Modified:
  stable/8/sys/dev/mii/brgphy.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cam/   (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/e1000/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/mii/brgphy.c
==============================================================================
--- stable/8/sys/dev/mii/brgphy.c	Sun Aug 15 23:13:09 2010	(r211378)
+++ stable/8/sys/dev/mii/brgphy.c	Sun Aug 15 23:26:46 2010	(r211379)
@@ -685,16 +685,15 @@ brgphy_status(struct mii_softc *sc)
 
 	}
 
-#if 0
-	/* Todo: Change bge/bce to use these settings. */
+	/* Todo: Change bge to use these settings. */
 
-	/* Fetch flow control settings from the PHY */
+	/* Fetch flow control settings from the copper PHY. */
 	if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) {
-		/* Set FLAG0 is RX is enabled and FLAG1 if TX is enabled */
+		/* Set FLAG0 if RX is enabled and FLAG1 if TX is enabled */
 		if ((anar & BRGPHY_ANAR_PC) && (anlpar & BRGPHY_ANLPAR_PC)) {
 			mii->mii_media_active |= IFM_FLAG0 | IFM_FLAG1;
 		} else if (!(anar & BRGPHY_ANAR_PC) && (anlpar & BRGPHY_ANAR_ASP) &&
-		    (anlpar & BRPHY_ANLPAR_PC) && (anlpar & BRGPHY_ANLPAR_ASP)) {
+		    (anlpar & BRGPHY_ANLPAR_PC) && (anlpar & BRGPHY_ANLPAR_ASP)) {
 			mii->mii_media_active |= IFM_FLAG1;
 		} else if ((anar & BRGPHY_ANAR_PC) && (anar & BRGPHY_ANAR_ASP) &&
 		    !(anlpar & BRGPHY_ANLPAR_PC) && (anlpar & BRGPHY_ANLPAR_ASP)) {
@@ -703,7 +702,6 @@ brgphy_status(struct mii_softc *sc)
 	}
 
 	/* Todo: Add support for fiber settings too. */
-#endif
 
 
 brgphy_status_exit: