diff options
| author | davidch <davidch@FreeBSD.org> | 2010-04-29 22:00:57 +0000 |
|---|---|---|
| committer | davidch <davidch@FreeBSD.org> | 2010-04-29 22:00:57 +0000 |
| commit | 104994efcf6a00276077f8e7a50df2b5b8bb3cec (patch) | |
| tree | 06d85a23d383e195815eb435028b0c714228428a | |
| parent | 1f717ed2d0f18a2bfb45acde8630100453f6b8a3 (diff) | |
| download | FreeBSD-src-104994efcf6a00276077f8e7a50df2b5b8bb3cec.zip FreeBSD-src-104994efcf6a00276077f8e7a50df2b5b8bb3cec.tar.gz | |
- Pass flow control settings back to bce(4).
MFC after: Two weeks
| -rw-r--r-- | sys/dev/mii/brgphy.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c index 97a423c..a733597 100644 --- a/sys/dev/mii/brgphy.c +++ b/sys/dev/mii/brgphy.c @@ -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: |
