diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2010-11-27 01:26:59 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2010-11-27 01:26:59 +0000 |
| commit | 12d314a661974e25076e915075d8bd2086b2ad2e (patch) | |
| tree | 22955755fb156a8c254d479f906f5e16cec092ca /sys/dev/mii | |
| parent | 84fe19c742a8414c1bf1ba8976163ea349f65a86 (diff) | |
| download | src-12d314a661974e25076e915075d8bd2086b2ad2e.tar.gz src-12d314a661974e25076e915075d8bd2086b2ad2e.zip | |
Allow pause support advertisement to be turned off again.
Submitted by: yongari (ip1000phy(4))
Notes
Notes:
svn path=/head/; revision=215923
Diffstat (limited to 'sys/dev/mii')
| -rw-r--r-- | sys/dev/mii/e1000phy.c | 1 | ||||
| -rw-r--r-- | sys/dev/mii/ip1000phy.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c index 1c0a267a0834..45fd4d033e80 100644 --- a/sys/dev/mii/e1000phy.c +++ b/sys/dev/mii/e1000phy.c @@ -497,6 +497,7 @@ e1000phy_mii_phy_auto(struct e1000phy_softc *esc, int media) sc = &esc->mii_sc; if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) { reg = PHY_READ(sc, E1000_AR); + reg &= ~(E1000_AR_PAUSE | E1000_AR_ASM_DIR); reg |= E1000_AR_10T | E1000_AR_10T_FD | E1000_AR_100TX | E1000_AR_100TX_FD; if ((media & IFM_FLOW) != 0 || diff --git a/sys/dev/mii/ip1000phy.c b/sys/dev/mii/ip1000phy.c index 242baf7ed464..571575740060 100644 --- a/sys/dev/mii/ip1000phy.c +++ b/sys/dev/mii/ip1000phy.c @@ -347,6 +347,7 @@ ip1000phy_mii_phy_auto(struct mii_softc *sc, int media) reg = 0; if (isc->model == MII_MODEL_ICPLUS_IP1001) { reg = PHY_READ(sc, IP1000PHY_MII_ANAR); + reg &= ~(IP1000PHY_ANAR_PAUSE | IP1000PHY_ANAR_APAUSE); reg |= IP1000PHY_ANAR_NP; } reg |= IP1000PHY_ANAR_10T | IP1000PHY_ANAR_10T_FDX | |