svn commit: r207391 - head/sys/dev/mii
David Christensen
davidch at FreeBSD.org
Thu Apr 29 22:00:57 UTC 2010
Author: davidch
Date: Thu Apr 29 22:00:57 2010
New Revision: 207391
URL: http://svn.freebsd.org/changeset/base/207391
Log:
- Pass flow control settings back to bce(4).
MFC after: Two weeks
Modified:
head/sys/dev/mii/brgphy.c
Modified: head/sys/dev/mii/brgphy.c
==============================================================================
--- head/sys/dev/mii/brgphy.c Thu Apr 29 21:55:20 2010 (r207390)
+++ head/sys/dev/mii/brgphy.c Thu Apr 29 22:00:57 2010 (r207391)
@@ -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:
More information about the svn-src-all
mailing list