From owner-svn-src-head@FreeBSD.ORG  Sat Nov 27 01:26:59 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB8341065670;
	Sat, 27 Nov 2010 01:26:59 +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 9A0428FC14;
	Sat, 27 Nov 2010 01:26:59 +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 oAR1Qxse003818;
	Sat, 27 Nov 2010 01:26:59 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAR1QxWZ003815;
	Sat, 27 Nov 2010 01:26:59 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201011270126.oAR1QxWZ003815@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 27 Nov 2010 01:26:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215923 - head/sys/dev/mii
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Nov 2010 01:26:59 -0000

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 |