From owner-svn-src-stable-7@FreeBSD.ORG  Thu Nov 13 11:00:15 2008
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4D32E106567E;
	Thu, 13 Nov 2008 11:00:15 +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 3CBE58FC14;
	Thu, 13 Nov 2008 11:00:15 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mADB0F45057298;
	Thu, 13 Nov 2008 11:00:15 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mADB0FHg057297;
	Thu, 13 Nov 2008 11:00:15 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <200811131100.mADB0FHg057297@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Thu, 13 Nov 2008 11:00:15 +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: r184918 - in stable/7/sys: . dev/mii modules/cxgb
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Nov 2008 11:00:15 -0000

Author: yongari
Date: Thu Nov 13 11:00:15 2008
New Revision: 184918
URL: http://svn.freebsd.org/changeset/base/184918

Log:
  MFC r184253:
    Use auto-negotiation for manual media type selection. This fixes
    establishment of 10/100Mbps link on Atheros AR8121(L1E).
  Approved by:	re (kib)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/dev/mii/atphy.c
  stable/7/sys/modules/cxgb/   (props changed)

Modified: stable/7/sys/dev/mii/atphy.c
==============================================================================
--- stable/7/sys/dev/mii/atphy.c	Thu Nov 13 10:40:13 2008	(r184917)
+++ stable/7/sys/dev/mii/atphy.c	Thu Nov 13 11:00:15 2008	(r184918)
@@ -217,7 +217,8 @@ atphy_service(struct mii_softc *sc, stru
 		/*
 		 * Reset the PHY so all changes take effect.
 		 */
-		PHY_WRITE(sc, MII_BMCR, bmcr | BMCR_RESET);
+		PHY_WRITE(sc, MII_BMCR, bmcr | BMCR_RESET | BMCR_AUTOEN |
+		    BMCR_STARTNEG);
 done:
 		break;