From owner-p4-projects@FreeBSD.ORG  Thu Oct  9 12:10:56 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 89D6716A4C0; Thu,  9 Oct 2003 12:10:56 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4C06F16A4B3
	for <perforce@freebsd.org>; Thu,  9 Oct 2003 12:10:56 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B859443FA3
	for <perforce@freebsd.org>; Thu,  9 Oct 2003 12:10:55 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h99JAtXJ098192
	for <perforce@freebsd.org>; Thu, 9 Oct 2003 12:10:55 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h99JAtN5098189
	for perforce@freebsd.org; Thu, 9 Oct 2003 12:10:55 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Thu, 9 Oct 2003 12:10:55 -0700 (PDT)
Message-Id: <200310091910.h99JAtN5098189@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 39417 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2003 19:10:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=39417

Change 39417 by sam@sam_ebb on 2003/10/09 12:10:43

	correct locking

Affected files ...

.. //depot/projects/netperf/sys/dev/em/if_em.c#6 edit

Differences ...

==== //depot/projects/netperf/sys/dev/em/if_em.c#6 (text+ko) ====

@@ -933,7 +933,7 @@
 
         if (ether_poll_register(em_poll, ifp)) {
                 em_disable_intr(adapter);
-                em_poll(ifp, 0, 1);
+                em_poll_locked(ifp, 0, 1);
 		EM_UNLOCK(adapter);
                 return;
         }