From owner-p4-projects@FreeBSD.ORG  Sun Jan 27 19:08:34 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E749816A41B; Sun, 27 Jan 2008 19:08:33 +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 94B3116A417
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 19:08:33 +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 84F3E13C46B
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 19:08:33 +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 m0RJ8XEh031475
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 19:08:33 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RJ8XtS031464
	for perforce@freebsd.org; Sun, 27 Jan 2008 19:08:33 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 27 Jan 2008 19:08:33 GMT
Message-Id: <200801271908.m0RJ8XtS031464@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 134226 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: Sun, 27 Jan 2008 19:08:34 -0000

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

Change 134226 by sam@sam_ebb on 2008/01/27 19:08:32

	add a public function ieee80211_node_deauth to drop a station
	associated to an ap vap; useful for drivers that need to drop
	a station for various reasons

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#6 edit
.. //depot/projects/vap/sys/net80211/ieee80211_node.c#20 edit
.. //depot/projects/vap/sys/net80211/ieee80211_node.h#13 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#6 (text+ko) ====

@@ -1505,8 +1505,7 @@
 
 	return 1;
 bad:
-	IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH, reason);
-	ieee80211_node_leave(ni);
+	ieee80211_node_deauth(ni, reason);
 	return 0;
 }
 

==== //depot/projects/vap/sys/net80211/ieee80211_node.c#20 (text+ko) ====

@@ -721,6 +721,20 @@
 	ieee80211_notify_node_leave(ni);
 }
 
+/*
+ * Send a deauthenticate frame and drop the station.
+ */
+void
+ieee80211_node_deauth(struct ieee80211_node *ni, int reason)
+{
+	/* NB: bump the refcnt to be sure temporay nodes are not reclaimed */
+	ieee80211_ref_node(ni);
+	if (ni->ni_associd != 0)
+		IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH, reason);
+	ieee80211_node_leave(ni);
+	ieee80211_free_node(ni);
+}
+
 static struct ieee80211_node *
 node_alloc(struct ieee80211_node_table *nt)
 {

==== //depot/projects/vap/sys/net80211/ieee80211_node.h#13 (text+ko) ====

@@ -275,6 +275,7 @@
 int	ieee80211_sta_join(struct ieee80211vap *,
 		const struct ieee80211_scan_entry *);
 void	ieee80211_sta_leave(struct ieee80211_node *);
+void	ieee80211_node_deauth(struct ieee80211_node *, int);
 
 int	ieee80211_ies_init(struct ieee80211_ies *, const uint8_t *, int);
 void	ieee80211_ies_cleanup(struct ieee80211_ies *);