From owner-p4-projects@FreeBSD.ORG  Tue Jan 16 21:10:23 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0099B16A58F; Tue, 16 Jan 2007 21:10:22 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CA26F16A574
	for <perforce@freebsd.org>; Tue, 16 Jan 2007 21:10:22 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net
	[66.23.211.162])
	by mx1.freebsd.org (Postfix) with ESMTP id 52BED13C45A
	for <perforce@freebsd.org>; Tue, 16 Jan 2007 21:10:12 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1])
	(authenticated bits=0)
	by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id l0GLA1M9047029;
	Tue, 16 Jan 2007 16:10:07 -0500 (EST) (envelope-from jhb@freebsd.org)
From: John Baldwin <jhb@freebsd.org>
To: Kip Macy <kmacy@freebsd.org>
Date: Tue, 16 Jan 2007 15:55:35 -0500
User-Agent: KMail/1.9.1
References: <200701150005.l0F05DZt019533@repoman.freebsd.org>
In-Reply-To: <200701150005.l0F05DZt019533@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200701161555.36296.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by
	milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]);
	Tue, 16 Jan 2007 16:10:07 -0500 (EST)
X-Virus-Scanned: ClamAV 0.88.3/2457/Tue Jan 16 06:53:04 2007 on
	server.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 
	autolearn=ham version=3.1.3
X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx
Cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: PERFORCE change 112916 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 16 Jan 2007 21:10:24 -0000

On Sunday 14 January 2007 19:05, Kip Macy wrote:
> http://perforce.freebsd.org/chv.cgi?CH=112916
> 
> Change 112916 by kmacy@kmacy_serendipity:sam_wifi on 2007/01/15 00:04:17
> 
> 	ensure that the ic lock is acquired before the driver softc lock
> 	enroll them in the proper order in WITNESS
> 
> Affected files ...
> 
> .. //depot/projects/wifi/sys/kern/subr_witness.c#20 edit
> 
> Differences ...
> 
> ==== //depot/projects/wifi/sys/kern/subr_witness.c#20 (text+ko) ====
> 
> @@ -361,6 +361,18 @@
>  	{ "nfsd_mtx", &lock_class_mtx_sleep },
>  	{ "so_snd", &lock_class_mtx_sleep },
>  	{ NULL, NULL },
> +
> +	/*
> +	 * IEEE 802.11
> +	 */
> +	{ "802.11 com lock", &lock_class_mtx_sleep},
> +	{ NULL, NULL },
> +	/*
> +	 * Network drivers
> +	 */
> +	{ "network driver", &lock_class_mtx_sleep},
> +	{ NULL, NULL },
> +

This doesn't encode any orders.  You probably need to drop the NULL, NULL 
after "802.11 com lock".  Basically, the order list is a list of lists, with 
each list terminated by a NULL, NULL, and the list of lists terminated by a 
double NULL, NULL.

-- 
John Baldwin