From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 21:16:27 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E0A901065670; Fri, 28 Mar 2008 21:16:26 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A3DFD106564A
	for <perforce@freebsd.org>; Fri, 28 Mar 2008 21:16:26 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 925358FC17
	for <perforce@freebsd.org>; Fri, 28 Mar 2008 21:16:26 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2SLGQaL036789
	for <perforce@freebsd.org>; Fri, 28 Mar 2008 21:16:26 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SLGQaP036787
	for perforce@freebsd.org; Fri, 28 Mar 2008 21:16:26 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Mar 2008 21:16:26 GMT
Message-Id: <200803282116.m2SLGQaP036787@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>
Cc: 
Subject: PERFORCE change 138855 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: Fri, 28 Mar 2008 21:16:27 -0000

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

Change 138855 by sam@sam_ebb on 2008/03/28 21:15:53

	blech, make the node table lock recursive until I can sort out
	locking for the mlme ops

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#21 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#21 (text+ko) ====

@@ -33,7 +33,8 @@
  */
 typedef struct mtx ieee80211_com_lock_t;
 #define	IEEE80211_LOCK_INIT(_ic, _name) \
-	mtx_init(&(_ic)->ic_comlock, _name, "802.11 com lock", MTX_DEF | MTX_RECURSE)
+	mtx_init(&(_ic)->ic_comlock, _name, "802.11 com lock", \
+	    MTX_DEF | MTX_RECURSE)
 #define	IEEE80211_LOCK_DESTROY(_ic) mtx_destroy(&(_ic)->ic_comlock)
 #define	IEEE80211_LOCK(_ic)	   mtx_lock(&(_ic)->ic_comlock)
 #define	IEEE80211_UNLOCK(_ic)	   mtx_unlock(&(_ic)->ic_comlock)
@@ -54,12 +55,11 @@
 
 /*
  * Node locking definitions.
- * NB: MTX_DUPOK is because we don't generate per-interface strings.
  */
 typedef struct mtx ieee80211_node_lock_t;
 #define	IEEE80211_NODE_LOCK_INIT(_nt, _name) \
 	mtx_init(&(_nt)->nt_nodelock, _name, "802.11 node table", \
-		MTX_DEF | MTX_DUPOK)
+	    MTX_DEF | MTX_RECURSE)
 #define	IEEE80211_NODE_LOCK_DESTROY(_nt)	mtx_destroy(&(_nt)->nt_nodelock)
 #define	IEEE80211_NODE_LOCK(_nt)		mtx_lock(&(_nt)->nt_nodelock)
 #define	IEEE80211_NODE_IS_LOCKED(_nt)		mtx_owned(&(_nt)->nt_nodelock)