From owner-svn-src-all@FreeBSD.ORG  Sun Aug 15 23:28:12 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 104D910656A4;
	Sun, 15 Aug 2010 23:28:12 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F2E758FC15;
	Sun, 15 Aug 2010 23:28:11 +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 o7FNSBPq076766;
	Sun, 15 Aug 2010 23:28:11 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7FNSBsS076764;
	Sun, 15 Aug 2010 23:28:11 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201008152328.o7FNSBsS076764@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Sun, 15 Aug 2010 23:28:11 +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: r211380 - stable/7/sys/dev/mii
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Aug 2010 23:28:12 -0000

Author: yongari
Date: Sun Aug 15 23:28:11 2010
New Revision: 211380
URL: http://svn.freebsd.org/changeset/base/211380

Log:
  MFC r207391:
    - Pass flow control settings back to bce(4).

Modified:
  stable/7/sys/dev/mii/brgphy.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/brgphy.c
==============================================================================
--- stable/7/sys/dev/mii/brgphy.c	Sun Aug 15 23:26:46 2010	(r211379)
+++ stable/7/sys/dev/mii/brgphy.c	Sun Aug 15 23:28:11 2010	(r211380)
@@ -673,16 +673,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)) {
@@ -691,7 +690,6 @@ brgphy_status(struct mii_softc *sc)
 	}
 
 	/* Todo: Add support for fiber settings too. */
-#endif
 
 
 brgphy_status_exit: