From owner-p4-projects@FreeBSD.ORG  Wed Nov  5 15:19:49 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8AD5616A4D1; Wed,  5 Nov 2003 15:19:49 -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 6605116A4CF
	for <perforce@freebsd.org>; Wed,  5 Nov 2003 15:19:49 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C127844001
	for <perforce@freebsd.org>; Wed,  5 Nov 2003 15:19:48 -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 hA5NJmXJ055524
	for <perforce@freebsd.org>; Wed, 5 Nov 2003 15:19:48 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA5NJmRT055521
	for perforce@freebsd.org; Wed, 5 Nov 2003 15:19:48 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Wed, 5 Nov 2003 15:19:48 -0800 (PST)
Message-Id: <200311052319.hA5NJmRT055521@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 41494 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: Wed, 05 Nov 2003 23:19:50 -0000

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

Change 41494 by sam@sam_ebb on 2003/11/05 15:19:28

	Cannot use NET_PICKUP/DROP_GIANT since we might be entered
	from the syncache timer routine.

Affected files ...

.. //depot/projects/netperf/sys/netinet/ip_divert.c#12 edit

Differences ...

==== //depot/projects/netperf/sys/netinet/ip_divert.c#12 (text+ko) ====

@@ -231,7 +231,7 @@
 	 * the moment we're ignoring this. Once sockets are
 	 * locked this cruft can be removed.
 	 */
-	NET_PICKUP_GIANT();
+	mtx_lock(&Giant);
 	/* Put packet on socket queue, if any */
 	sa = NULL;
 	nport = htons((u_int16_t)port);
@@ -253,7 +253,7 @@
 		INP_UNLOCK(inp);
 	}
 	INP_INFO_RUNLOCK(&divcbinfo);
-	NET_DROP_GIANT();
+	mtx_unlock(&Giant);
 	if (sa == NULL) {
 		m_freem(m);
 		ipstat.ips_noproto++;