From owner-p4-projects@FreeBSD.ORG  Tue Sep  2 22:00:07 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D04EA16A4C1; Tue,  2 Sep 2003 22:00:06 -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 9375816A4BF
	for <perforce@freebsd.org>; Tue,  2 Sep 2003 22:00:06 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9B10A43FFD
	for <perforce@freebsd.org>; Tue,  2 Sep 2003 22:00:05 -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 h835050U047283
	for <perforce@freebsd.org>; Tue, 2 Sep 2003 22:00:05 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h83505wl047280
	for perforce@freebsd.org; Tue, 2 Sep 2003 22:00:05 -0700 (PDT)
Date: Tue, 2 Sep 2003 22:00:05 -0700 (PDT)
Message-Id: <200309030500.h83505wl047280@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 37423 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, 03 Sep 2003 05:00:07 -0000

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

Change 37423 by sam@sam_ebb on 2003/09/02 21:59:37

	correct lock assertions

Affected files ...

.. //depot/projects/netperf/sys/netinet/ip_mroute.c#8 edit

Differences ...

==== //depot/projects/netperf/sys/netinet/ip_mroute.c#8 (text+ko) ====

@@ -2975,7 +2975,7 @@
     struct igmpmsg *im;
     struct sockaddr_in k_igmpsrc = { sizeof k_igmpsrc, AF_INET };
     
-    VIF_TABLE_ASSERT(MA_OWNED);
+    VIF_LOCK_ASSERT();
 
     /*
      * Add a new mbuf with an upcall header
@@ -3030,7 +3030,7 @@
     int len = ntohs(ip->ip_len);
     vifi_t vifi = rt->mfc_parent;
     
-    VIF_TABLE_ASSERT(MA_OWNED);
+    VIF_LOCK_ASSERT();
     
     if ((vifi >= numvifs) || (viftable[vifi].v_lcl_addr.s_addr == 0)) {
 	m_freem(mb_copy);