From owner-svn-src-head@FreeBSD.ORG  Tue Dec 22 15:41:58 2009
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 E7CB31065694;
	Tue, 22 Dec 2009 15:41:58 +0000 (UTC)
	(envelope-from gallatin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D6CC08FC0A;
	Tue, 22 Dec 2009 15:41:58 +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 nBMFfwc5068290;
	Tue, 22 Dec 2009 15:41:58 GMT
	(envelope-from gallatin@svn.freebsd.org)
Received: (from gallatin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBMFfwrc068288;
	Tue, 22 Dec 2009 15:41:58 GMT
	(envelope-from gallatin@svn.freebsd.org)
Message-Id: <200912221541.nBMFfwrc068288@svn.freebsd.org>
From: Andrew Gallatin <gallatin@FreeBSD.org>
Date: Tue, 22 Dec 2009 15:41:58 +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: r200845 - head/sys/dev/mxge
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: Tue, 22 Dec 2009 15:41:59 -0000

Author: gallatin
Date: Tue Dec 22 15:41:58 2009
New Revision: 200845
URL: http://svn.freebsd.org/changeset/base/200845

Log:
  Don't take the driver mutex in mxge_tick(), as it
  is run with the mutex held.
  
  Submitted by: rwatson
  MFC after:	3 days

Modified:
  head/sys/dev/mxge/if_mxge.c

Modified: head/sys/dev/mxge/if_mxge.c
==============================================================================
--- head/sys/dev/mxge/if_mxge.c	Tue Dec 22 15:13:16 2009	(r200844)
+++ head/sys/dev/mxge/if_mxge.c	Tue Dec 22 15:41:58 2009	(r200845)
@@ -3956,9 +3956,7 @@ mxge_tick(void *arg)
 	uint16_t cmd;
 
 	ticks = mxge_ticks;
-	mtx_lock(&sc->driver_mtx);
 	running = sc->ifp->if_drv_flags & IFF_DRV_RUNNING;
-	mtx_unlock(&sc->driver_mtx);
 	if (running) {
 		/* aggregate stats from different slices */
 		pkts = mxge_update_stats(sc);