Date: Fri, 28 Mar 2008 21:16:26 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 138855 for review Message-ID: <200803282116.m2SLGQaP036787@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803282116.m2SLGQaP036787>