From owner-svn-src-head@FreeBSD.ORG  Thu Apr 29 22:00:57 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B33771065672;
	Thu, 29 Apr 2010 22:00:57 +0000 (UTC)
	(envelope-from davidch@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id A20BE8FC08;
	Thu, 29 Apr 2010 22:00:57 +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 o3TM0vRY070889;
	Thu, 29 Apr 2010 22:00:57 GMT (envelope-from davidch@svn.freebsd.org)
Received: (from davidch@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3TM0vdb070887;
	Thu, 29 Apr 2010 22:00:57 GMT (envelope-from davidch@svn.freebsd.org)
Message-Id: <201004292200.o3TM0vdb070887@svn.freebsd.org>
From: David Christensen <davidch@FreeBSD.org>
Date: Thu, 29 Apr 2010 22:00:57 +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: r207391 - 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: Thu, 29 Apr 2010 22:00:57 -0000

Author: davidch
Date: Thu Apr 29 22:00:57 2010
New Revision: 207391
URL: http://svn.freebsd.org/changeset/base/207391

Log:
  - Pass flow control settings back to bce(4).
  
  MFC after:	Two weeks

Modified:
  head/sys/dev/mii/brgphy.c

Modified: head/sys/dev/mii/brgphy.c
==============================================================================
--- head/sys/dev/mii/brgphy.c	Thu Apr 29 21:55:20 2010	(r207390)
+++ head/sys/dev/mii/brgphy.c	Thu Apr 29 22:00:57 2010	(r207391)
@@ -685,16 +685,15 @@ brgphy_status(struct mii_softc *sc)
 
 	}
 
-#if 0
-	/* Todo: Change bge/bce to use these settings. */
+	/* Todo: Change bge to use these settings. */
 
-	/* Fetch flow control settings from the PHY */
+	/* Fetch flow control settings from the copper PHY. */
 	if ((sc->mii_flags & MIIF_HAVEFIBER) == 0) {
-		/* Set FLAG0 is RX is enabled and FLAG1 if TX is enabled */
+		/* Set FLAG0 if RX is enabled and FLAG1 if TX is enabled */
 		if ((anar & BRGPHY_ANAR_PC) && (anlpar & BRGPHY_ANLPAR_PC)) {
 			mii->mii_media_active |= IFM_FLAG0 | IFM_FLAG1;
 		} else if (!(anar & BRGPHY_ANAR_PC) && (anlpar & BRGPHY_ANAR_ASP) &&
-		    (anlpar & BRPHY_ANLPAR_PC) && (anlpar & BRGPHY_ANLPAR_ASP)) {
+		    (anlpar & BRGPHY_ANLPAR_PC) && (anlpar & BRGPHY_ANLPAR_ASP)) {
 			mii->mii_media_active |= IFM_FLAG1;
 		} else if ((anar & BRGPHY_ANAR_PC) && (anar & BRGPHY_ANAR_ASP) &&
 		    !(anlpar & BRGPHY_ANLPAR_PC) && (anlpar & BRGPHY_ANLPAR_ASP)) {
@@ -703,7 +702,6 @@ brgphy_status(struct mii_softc *sc)
 	}
 
 	/* Todo: Add support for fiber settings too. */
-#endif
 
 
 brgphy_status_exit: