From owner-p4-projects@FreeBSD.ORG  Mon Jan 15 00:05:14 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 9576A16A492; Mon, 15 Jan 2007 00:05:14 +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 521E916A415
	for <perforce@freebsd.org>; Mon, 15 Jan 2007 00:05:14 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 341E613C448
	for <perforce@freebsd.org>; Mon, 15 Jan 2007 00:05:14 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0F05E20019536
	for <perforce@freebsd.org>; Mon, 15 Jan 2007 00:05:14 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0F05DZt019533
	for perforce@freebsd.org; Mon, 15 Jan 2007 00:05:13 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 15 Jan 2007 00:05:13 GMT
Message-Id: <200701150005.l0F05DZt019533@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: 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: Mon, 15 Jan 2007 00:05:14 -0000

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 },
+
 	/*
 	 * CDEV
 	 */