From owner-p4-projects@FreeBSD.ORG  Tue Aug 26 16:39:59 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0048F16A4C1; Tue, 26 Aug 2003 16:39:58 -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 B476616A4BF
	for <perforce@freebsd.org>; Tue, 26 Aug 2003 16:39:58 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5F3E143FB1
	for <perforce@freebsd.org>; Tue, 26 Aug 2003 16:39:58 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7QNdw0U022590
	for <perforce@freebsd.org>; Tue, 26 Aug 2003 16:39:58 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7QNdvjj022587
	for perforce@freebsd.org; Tue, 26 Aug 2003 16:39:57 -0700 (PDT)
Date: Tue, 26 Aug 2003 16:39:57 -0700 (PDT)
Message-Id: <200308262339.h7QNdvjj022587@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 36993 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: Tue, 26 Aug 2003 23:39:59 -0000

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

Change 36993 by sam@sam_ebb on 2003/08/26 16:39:12

	must lock the dummynet tables when scanning on ipfw rule delete

Affected files ...

.. //depot/projects/netperf/sys/netinet/ip_dummynet.c#5 edit

Differences ...

==== //depot/projects/netperf/sys/netinet/ip_dummynet.c#5 (text+ko) ====

@@ -1419,8 +1419,7 @@
     struct dn_pkt *pkt ;
     struct dn_flow_set *fs ;
 
-    DUMMYNET_LOCK_ASSERT(MA_OWNED);
-
+    DUMMYNET_LOCK();
     /*
      * If the rule references a queue (dn_flow_set), then scan
      * the flow set, otherwise scan pipes. Should do either, but doing
@@ -1435,6 +1434,7 @@
 	    if (pkt->rule == r)
 		pkt->rule = ip_fw_default_rule ;
     }
+    DUMMYNET_UNLOCK();
 }
 
 /*