Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 28 Nov 2010 16:09:37 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r216006 - stable/8/sys/dev/mii
Message-ID:  <201011281609.oASG9blR025952@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: marius
Date: Sun Nov 28 16:09:36 2010
New Revision: 216006
URL: http://svn.freebsd.org/changeset/base/216006

Log:
  MFC: r215923
  
  Allow pause support advertisement to be turned off again.
  
  Submitted by:	yongari (ip1000phy(4))

Modified:
  stable/8/sys/dev/mii/e1000phy.c
  stable/8/sys/dev/mii/ip1000phy.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/mii/e1000phy.c
==============================================================================
--- stable/8/sys/dev/mii/e1000phy.c	Sun Nov 28 16:03:03 2010	(r216005)
+++ stable/8/sys/dev/mii/e1000phy.c	Sun Nov 28 16:09:36 2010	(r216006)
@@ -498,6 +498,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: stable/8/sys/dev/mii/ip1000phy.c
==============================================================================
--- stable/8/sys/dev/mii/ip1000phy.c	Sun Nov 28 16:03:03 2010	(r216005)
+++ stable/8/sys/dev/mii/ip1000phy.c	Sun Nov 28 16:09:36 2010	(r216006)
@@ -348,6 +348,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 |

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011281609.oASG9blR025952>