From owner-p4-projects@FreeBSD.ORG  Thu Jan 20 01:18:20 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1AB5D16A4D0; Thu, 20 Jan 2005 01:18:20 +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 EB8A316A4CE
	for <perforce@freebsd.org>; Thu, 20 Jan 2005 01:18:19 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D823343D31
	for <perforce@freebsd.org>; Thu, 20 Jan 2005 01:18:19 +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 j0K1IJSG013582
	for <perforce@freebsd.org>; Thu, 20 Jan 2005 01:18:19 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0K1IJ3I013579
	for perforce@freebsd.org; Thu, 20 Jan 2005 01:18:19 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 20 Jan 2005 01:18:19 GMT
Message-Id: <200501200118.j0K1IJ3I013579@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 69340 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: Thu, 20 Jan 2005 01:18:20 -0000

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

Change 69340 by sam@sam_ebb on 2005/01/20 01:17:33

	when a station is removed due to inactivity remove them from
	the table so they aren't considered again

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#46 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#46 (text+ko) ====

@@ -1698,6 +1698,7 @@
 void
 ieee80211_node_leave(struct ieee80211com *ic, struct ieee80211_node *ni)
 {
+	struct ieee80211_node_table *nt = ni->ni_table;
 
 	IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG,
 	    "[%s] station with aid %d leaves\n",
@@ -1737,8 +1738,18 @@
 	 */
 	ieee80211_sta_leave(ic, ni);
 done:
-	ni->ni_inact_reload = ic->ic_inact_init;	/* just in case */
-	ieee80211_free_node(ni);
+	/*
+	 * Remove the node from any table it's recorded in and
+	 * drop the caller's reference.  Removal from the table
+	 * is important to insure the node is not reprocessed
+	 * for inactivity.
+	 */
+	if (nt != NULL) {
+		IEEE80211_NODE_LOCK(nt);
+		node_reclaim(nt, ni);
+		IEEE80211_NODE_UNLOCK(nt);
+	} else
+		ieee80211_free_node(ni);
 }
 
 u_int8_t