Author: marius
Date: Sat Nov 27 01:26:59 2010
New Revision: 215923
URL: http://svn.freebsd.org/changeset/base/215923
Log:
Allow pause support advertisement to be turned off again.
Submitted by: yongari (ip1000phy(4))
Modified:
head/sys/dev/mii/e1000phy.c
head/sys/dev/mii/ip1000phy.c
Modified: head/sys/dev/mii/e1000phy.c
==============================================================================
--- head/sys/dev/mii/e1000phy.c Sat Nov 27 01:09:54 2010 (r215922)
+++ head/sys/dev/mii/e1000phy.c Sat Nov 27 01:26:59 2010 (r215923)
@@ -497,6 +497,7 @@ e1000phy_mii_phy_auto(struct e1000phy_so
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 ||
Modified: head/sys/dev/mii/ip1000phy.c
==============================================================================
--- head/sys/dev/mii/ip1000phy.c Sat Nov 27 01:09:54 2010
(r215922)
+++ head/sys/dev/mii/ip1000phy.c Sat Nov 27 01:26:59 2010
(r215923)
@@ -347,6 +347,7 @@ ip1000phy_mii_phy_auto(struct mii_softc
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 |
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
