From owner-p4-projects@FreeBSD.ORG  Thu Jan 20 01:16:17 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3D1E116A4D1; Thu, 20 Jan 2005 01:16:17 +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 1922316A4CE
	for <perforce@freebsd.org>; Thu, 20 Jan 2005 01:16:17 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E25DE43D48
	for <perforce@freebsd.org>; Thu, 20 Jan 2005 01:16:16 +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 j0K1GGm3013541
	for <perforce@freebsd.org>; Thu, 20 Jan 2005 01:16:16 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0K1GG37013538
	for perforce@freebsd.org; Thu, 20 Jan 2005 01:16:16 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 20 Jan 2005 01:16:16 GMT
Message-Id: <200501200116.j0K1GG37013538@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 69339 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:16:17 -0000

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

Change 69339 by sam@sam_ebb on 2005/01/20 01:15:39

	explicitly avoid timing out ourself due to inactivity; it
	can easily happen if the bss is quiet

Affected files ...

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

Differences ...

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

@@ -1362,6 +1362,12 @@
 			m_freem(ni->ni_rxfrag[0]);
 			ni->ni_rxfrag[0] = NULL;
 		}
+		/*
+		 * Special case ourself; we may be idle for extended periods
+		 * of time and regardless reclaiming our state is wrong.
+		 */
+		if (ni == ic->ic_bss)
+			continue;
 		ni->ni_inact--;
 		if (ni->ni_associd != 0) {
 			/*