From owner-svn-src-head@FreeBSD.ORG  Fri Nov 12 19:33:14 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 2FEE8106566B;
	Fri, 12 Nov 2010 19:33:14 +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 1E00E8FC1F;
	Fri, 12 Nov 2010 19:33:14 +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 oACJXENV021195;
	Fri, 12 Nov 2010 19:33:14 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACJXEY2021193;
	Fri, 12 Nov 2010 19:33:14 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201011121933.oACJXEY2021193@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Fri, 12 Nov 2010 19:33:13 +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: r215194 - head/sys/dev/nfe
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: Fri, 12 Nov 2010 19:33:14 -0000

Author: yongari
Date: Fri Nov 12 19:33:13 2010
New Revision: 215194
URL: http://svn.freebsd.org/changeset/base/215194

Log:
  Fix regression introduced in r215132. Caller always holds a driver
  lock before accessing mii, so locking is not needed here.
  
  Reported by:	Rob Farmer (rfarmer <> predatorlabs dot net)

Modified:
  head/sys/dev/nfe/if_nfe.c

Modified: head/sys/dev/nfe/if_nfe.c
==============================================================================
--- head/sys/dev/nfe/if_nfe.c	Fri Nov 12 19:25:11 2010	(r215193)
+++ head/sys/dev/nfe/if_nfe.c	Fri Nov 12 19:33:13 2010	(r215194)
@@ -817,8 +817,6 @@ nfe_miibus_statchg(device_t dev)
 
 	sc = device_get_softc(dev);
 
-	NFE_LOCK(sc);
-
 	mii = device_get_softc(sc->nfe_miibus);
 	ifp = sc->nfe_ifp;
 
@@ -848,8 +846,6 @@ nfe_miibus_statchg(device_t dev)
 	}
 	NFE_WRITE(sc, NFE_TX_CTL, txctl);
 	NFE_WRITE(sc, NFE_RX_CTL, rxctl);
-
-	NFE_UNLOCK(sc);
 }