From owner-p4-projects@FreeBSD.ORG  Wed Feb 20 22:10:54 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 89ABD16A404; Wed, 20 Feb 2008 22:10:54 +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 44C9116A400
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 22:10:54 +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 3231613C447
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 22:10:54 +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 m1KMAskd007948
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 22:10:54 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1KMArTv007945
	for perforce@freebsd.org; Wed, 20 Feb 2008 22:10:53 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 20 Feb 2008 22:10:53 GMT
Message-Id: <200802202210.m1KMArTv007945@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 135840 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: Wed, 20 Feb 2008 22:10:54 -0000

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

Change 135840 by sam@sam_ebb on 2008/02/20 22:10:33

	can't recurse on the node table lock; need to think about
	whether this is needed on freebsd

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#30 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#30 (text+ko) ====

@@ -1207,14 +1207,12 @@
 			mlmeop.reason = reason;
 			/* NB: the broadcast address means do 'em all */
 			if (!IEEE80211_ADDR_EQ(mac, ic->ic_ifp->if_broadcastaddr)) {
-				IEEE80211_NODE_LOCK(&ic->ic_sta);
 				ni = ieee80211_find_node(&ic->ic_sta, mac);
 				if (ni != NULL) {
 					domlme(&mlmeop, ni);
 					ieee80211_free_node(ni);
 				} else
 					error = ENOENT;
-				IEEE80211_NODE_UNLOCK(&ic->ic_sta);
 			} else {
 				ieee80211_iterate_nodes(&ic->ic_sta,
 						domlme, &mlmeop);
@@ -1250,7 +1248,6 @@
 			error = EINVAL;
 			break;
 		}
-		IEEE80211_NODE_LOCK(&ic->ic_sta);
 		ni = ieee80211_find_vap_node(&ic->ic_sta, vap, mac);
 		if (ni != NULL) {
 			IEEE80211_NOTE(vap,
@@ -1264,14 +1261,12 @@
 			ieee80211_free_node(ni);
 		} else
 			error = ENOENT;
-		IEEE80211_NODE_UNLOCK(&ic->ic_sta);
 		break;
 	case IEEE80211_MLME_AUTH:
 		if (vap->iv_opmode != IEEE80211_M_HOSTAP) {
 			error = EINVAL;
 			break;
 		}
-		IEEE80211_NODE_LOCK(&ic->ic_sta);
 		ni = ieee80211_find_vap_node(&ic->ic_sta, vap, mac);
 		if (ni != NULL) {
 			if (reason == IEEE80211_STATUS_SUCCESS) {
@@ -1303,7 +1298,6 @@
 			ieee80211_free_node(ni);
 		} else
 			error = ENOENT;
-		IEEE80211_NODE_UNLOCK(&ic->ic_sta);
 		break;
 	default:
 		error = EINVAL;