d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow pause support advertisement to be turned off again.

Browse Source 
Submitted by:	yongari (ip1000phy(4))
This commit is contained in:
marius 2010-11-27 01:26:59 +00:00
parent 49aafa9304
commit 08604ad240
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/dev/mii/e1000phy.c
View File

@ -497,6 +497,7 @@ e1000phy_mii_phy_auto(struct e1000phy_softc *esc, int media)
sc = &esc->mii_sc; sc = &esc->mii_sc;
if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) { if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) {
reg = PHY_READ(sc, E1000_AR); reg = PHY_READ(sc, E1000_AR);
reg &= ~(E1000_AR_PAUSE | E1000_AR_ASM_DIR);
reg |= E1000_AR_10T | E1000_AR_10T_FD | reg |= E1000_AR_10T | E1000_AR_10T_FD |
E1000_AR_100TX | E1000_AR_100TX_FD; E1000_AR_100TX | E1000_AR_100TX_FD;
if ((media & IFM_FLOW) != 0 || if ((media & IFM_FLOW) != 0 ||

1
sys/dev/mii/ip1000phy.c
View File

@ -347,6 +347,7 @@ ip1000phy_mii_phy_auto(struct mii_softc *sc, int media)
reg = 0; reg = 0;
if (isc->model == MII_MODEL_ICPLUS_IP1001) { if (isc->model == MII_MODEL_ICPLUS_IP1001) {
reg = PHY_READ(sc, IP1000PHY_MII_ANAR); reg = PHY_READ(sc, IP1000PHY_MII_ANAR);
reg &= ~(IP1000PHY_ANAR_PAUSE | IP1000PHY_ANAR_APAUSE);
reg |= IP1000PHY_ANAR_NP; reg |= IP1000PHY_ANAR_NP;
} }
reg |= IP1000PHY_ANAR_10T | IP1000PHY_ANAR_10T_FDX | reg |= IP1000PHY_ANAR_10T | IP1000PHY_ANAR_10T_FDX |