From owner-svn-src-head@FreeBSD.ORG  Sat Apr 10 19:25:56 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 4EB751065670;
	Sat, 10 Apr 2010 19:25:56 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3FCB88FC1D;
	Sat, 10 Apr 2010 19:25:56 +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 o3AJPuSI070936;
	Sat, 10 Apr 2010 19:25:56 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3AJPuaJ070934;
	Sat, 10 Apr 2010 19:25:56 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201004101925.o3AJPuaJ070934@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Sat, 10 Apr 2010 19:25:56 +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: r206460 - head/sys/dev/e1000
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: Sat, 10 Apr 2010 19:25:56 -0000

Author: jfv
Date: Sat Apr 10 19:25:55 2010
New Revision: 206460
URL: http://svn.freebsd.org/changeset/base/206460

Log:
  The lock move in rxeof necessitated a couple
  more places to do the locking, fixes a panic.

Modified:
  head/sys/dev/e1000/if_em.c

Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c	Sat Apr 10 18:38:11 2010	(r206459)
+++ head/sys/dev/e1000/if_em.c	Sat Apr 10 19:25:55 2010	(r206460)
@@ -1371,7 +1371,9 @@ em_poll(struct ifnet *ifp, enum poll_cmd
 	}
 	EM_CORE_UNLOCK(adapter);
 
+	EM_RX_LOCK(rxr);
 	rx_done = em_rxeof(rxr, count);
+	EM_RX_UNLOCK(rxr);
 
 	EM_TX_LOCK(txr);
 	em_txeof(txr);
@@ -1447,7 +1449,10 @@ em_handle_que(void *context, int pending
 
 
 	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+		EM_RX_LOCK(rxr);
 		more_rx = em_rxeof(rxr, adapter->rx_process_limit);
+		EM_RX_UNLOCK(rxr);
+
 		EM_TX_LOCK(txr);
 		em_txeof(txr);
 #ifdef EM_MULTIQUEUE