From owner-svn-src-stable-8@FreeBSD.ORG  Wed Jan  5 11:46:17 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D1FAC106566B;
	Wed,  5 Jan 2011 11:46:17 +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 C073E8FC0A;
	Wed,  5 Jan 2011 11:46:17 +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 p05BkH5F076720;
	Wed, 5 Jan 2011 11:46:17 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p05BkHYs076718;
	Wed, 5 Jan 2011 11:46:17 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201101051146.p05BkHYs076718@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 5 Jan 2011 11:46:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216993 - stable/8/sys/dev/mii
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Jan 2011 11:46:17 -0000

Author: marius
Date: Wed Jan  5 11:46:17 2011
New Revision: 216993
URL: http://svn.freebsd.org/changeset/base/216993

Log:
  MFC: r216623
  
  - Add a comment regarding the fact that as documented in the datasheet
    manual 1000BASE-T modes of DP83865 only work together with other National
    Semiconductor PHYs.
  - Spell 10BASE-T correctly
  - Remove some redundant braces.

Modified:
  stable/8/sys/dev/mii/nsgphy.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/nsgphy.c
==============================================================================
--- stable/8/sys/dev/mii/nsgphy.c	Wed Jan  5 11:43:17 2011	(r216992)
+++ stable/8/sys/dev/mii/nsgphy.c	Wed Jan  5 11:46:17 2011	(r216993)
@@ -140,11 +140,15 @@ nsgphy_attach(device_t dev)
 	mii_phy_reset(sc);
 
 	/*
-	 * NB: the PHY has the 10baseT BMSR bits hard-wired to 0,
-	 * even though it supports 10baseT.
+	 * NB: the PHY has the 10BASE-T BMSR bits hard-wired to 0,
+	 * even though it supports 10BASE-T.
 	 */
 	sc->mii_capabilities = (PHY_READ(sc, MII_BMSR) |
-	    (BMSR_10TFDX | BMSR_10THDX)) & ma->mii_capmask;
+	    BMSR_10TFDX | BMSR_10THDX) & ma->mii_capmask;
+	/*
+	 * Note that as documented manual 1000BASE-T modes of DP83865 only
+	 * work together with other National Semiconductor PHYs.
+	 */
 	if (sc->mii_capabilities & BMSR_EXTSTAT)
 		sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR);