From owner-svn-src-stable@FreeBSD.ORG  Sun Nov 28 16:09:40 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 66981106576E;
	Sun, 28 Nov 2010 16:09:40 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 525BE8FC0C;
	Sun, 28 Nov 2010 16:09:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oASG9eqV025995;
	Sun, 28 Nov 2010 16:09:40 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oASG9et8025993;
	Sun, 28 Nov 2010 16:09:40 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201011281609.oASG9et8025993@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 28 Nov 2010 16:09:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216007 - stable/7/sys/dev/mii
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Nov 2010 16:09:40 -0000

Author: marius
Date: Sun Nov 28 16:09:40 2010
New Revision: 216007
URL: http://svn.freebsd.org/changeset/base/216007

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

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

Modified: stable/7/sys/dev/mii/e1000phy.c
==============================================================================
--- stable/7/sys/dev/mii/e1000phy.c	Sun Nov 28 16:09:36 2010	(r216006)
+++ stable/7/sys/dev/mii/e1000phy.c	Sun Nov 28 16:09:40 2010	(r216007)
@@ -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/7/sys/dev/mii/ip1000phy.c
==============================================================================
--- stable/7/sys/dev/mii/ip1000phy.c	Sun Nov 28 16:09:36 2010	(r216006)
+++ stable/7/sys/dev/mii/ip1000phy.c	Sun Nov 28 16:09:40 2010	(r216007)
@@ -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 |