From owner-p4-projects@FreeBSD.ORG  Wed Nov  5 21:07:27 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4537A16A4D0; Wed,  5 Nov 2003 21:07:27 -0800 (PST)
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 1ECC216A4CE
	for <perforce@freebsd.org>; Wed,  5 Nov 2003 21:07:27 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9C3B143FF2
	for <perforce@freebsd.org>; Wed,  5 Nov 2003 21:07:26 -0800 (PST)
	(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 hA657QXJ091194
	for <perforce@freebsd.org>; Wed, 5 Nov 2003 21:07:26 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA657P5V091191
	for perforce@freebsd.org; Wed, 5 Nov 2003 21:07:25 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Wed, 5 Nov 2003 21:07:25 -0800 (PST)
Message-Id: <200311060507.hA657P5V091191@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 41561 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, 06 Nov 2003 05:07:27 -0000

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

Change 41561 by sam@sam_ebb on 2003/11/05 21:07:22

	don't grab Giant explicitly; let netisr do it

Affected files ...

.. //depot/projects/netperf/sys/netatm/atm_subr.c#4 edit

Differences ...

==== //depot/projects/netperf/sys/netatm/atm_subr.c#4 (text+ko) ====

@@ -141,7 +141,7 @@
 
 	atm_intrq.ifq_maxlen = ATM_INTRQ_MAX;
 	mtx_init(&atm_intrq.ifq_mtx, "atm_inq", NULL, MTX_DEF);
-	netisr_register(NETISR_ATM, atm_intr, &atm_intrq);
+	netisr_register(NETISR_ATM, atm_intr, &atm_intrq, 0);
 
 	/*
 	 * Initialize subsystems
@@ -557,7 +557,8 @@
 	atm_intr_func_t	func;
 	void		*token;
 
-	mtx_lock(&Giant);
+	GIANT_REQUIRED;
+
 	/*
 	 * Get function to call and token value
 	 */
@@ -581,7 +582,6 @@
 	 * Drain any deferred calls
 	 */
 	STACK_DRAIN();
-	mtx_unlock(&Giant);
 }
 
 /*