From owner-p4-projects@FreeBSD.ORG  Wed Dec  1 18:49:55 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 595CF16A4D0; Wed,  1 Dec 2004 18:49:55 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 36D7816A4CE
	for <perforce@freebsd.org>; Wed,  1 Dec 2004 18:49:55 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2524D43D49
	for <perforce@freebsd.org>; Wed,  1 Dec 2004 18:49:55 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB1Intxj005591
	for <perforce@freebsd.org>; Wed, 1 Dec 2004 18:49:55 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB1InsSY005588
	for perforce@freebsd.org; Wed, 1 Dec 2004 18:49:54 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 1 Dec 2004 18:49:54 GMT
Message-Id: <200412011849.iB1InsSY005588@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>
Subject: PERFORCE change 66196 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 01 Dec 2004 18:49:55 -0000

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

Change 66196 by sam@sam_ebb on 2004/12/01 18:49:02

	o implement "kick all" for setmlme deauth/disassoc
	o correct setmlme deauth/disassoc to send the correct
	  mgmt frame based on the request

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#20 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#20 (text+ko) ====

@@ -1528,6 +1528,22 @@
 	return 0;
 }
 
+static void
+domlme(void *arg, struct ieee80211_node *ni)
+{
+	struct ieee80211com *ic = ni->ni_ic;
+	struct ieee80211req_mlme *mlme = arg;
+
+	if (ni->ni_associd != 0) {
+		IEEE80211_SEND_MGMT(ic, ni,
+			mlme->im_op == IEEE80211_MLME_DEAUTH ?
+				IEEE80211_FC0_SUBTYPE_DEAUTH :
+				IEEE80211_FC0_SUBTYPE_DISASSOC,
+			mlme->im_reason);
+	}
+	ieee80211_node_leave(ic, ni);
+}
+
 static int
 ieee80211_ioctl_setmlme(struct ieee80211com *ic, struct ieee80211req *ireq)
 {
@@ -1576,16 +1592,19 @@
 				mlme.im_reason);
 			break;
 		case IEEE80211_M_HOSTAP:
-			if (ic->ic_sta == NULL)
-				return EINVAL;
-			ni = ieee80211_find_node(ic->ic_sta, mlme.im_macaddr);
-			if (ni == NULL)
-				return EINVAL;
-			IEEE80211_SEND_MGMT(ic, ni,
-			    IEEE80211_FC0_SUBTYPE_DEAUTH,
-			    mlme.im_reason);
-			ieee80211_node_leave(ic, ni);
-			ieee80211_free_node(ni);
+			/* NB: the broadcast address means do 'em all */
+			if (!IEEE80211_ADDR_EQ(mlme.im_macaddr, ic->ic_ifp->if_broadcastaddr)) {
+				if (ic->ic_sta == NULL ||
+				    (ni = ieee80211_find_node(ic->ic_sta,
+						mlme.im_macaddr)) == NULL)
+					return EINVAL;
+				domlme(&mlme, ni);
+				ieee80211_free_node(ni);
+			} else {
+				if (ic->ic_sta != NULL)
+					ieee80211_iterate_nodes(ic->ic_sta,
+						domlme, &mlme);
+			}
 			break;
 		default:
 			return EINVAL;