diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2010-11-28 16:09:40 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2010-11-28 16:09:40 +0000 |
| commit | 49d99dc72d416b0c766096d42877ed599d7980d0 (patch) | |
| tree | 5c579a2e05b39bc2cbf042c146a33e7603a5d9b7 /sys | |
| parent | bd0ea1126a0521bed99e3499708378da811c44d7 (diff) | |
Notes
Diffstat (limited to 'sys')
| -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 0f095dceb585f..048aed21d1cdd 100644 --- a/sys/dev/mii/e1000phy.c +++ b/sys/dev/mii/e1000phy.c @@ -498,6 +498,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 eabcaf94886ab..8b87ec2ba4014 100644 --- a/sys/dev/mii/ip1000phy.c +++ b/sys/dev/mii/ip1000phy.c @@ -348,6 +348,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 | |