From owner-p4-projects@FreeBSD.ORG  Sat Dec  4 02:48:46 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CEDF816A4D0; Sat,  4 Dec 2004 02:48:45 +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 ABF5316A4CE
	for <perforce@freebsd.org>; Sat,  4 Dec 2004 02:48:45 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9C7C543D58
	for <perforce@freebsd.org>; Sat,  4 Dec 2004 02:48:45 +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 iB42mjuC018076
	for <perforce@freebsd.org>; Sat, 4 Dec 2004 02:48:45 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB42mj9P018073
	for perforce@freebsd.org; Sat, 4 Dec 2004 02:48:45 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 4 Dec 2004 02:48:45 GMT
Message-Id: <200412040248.iB42mj9P018073@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 66383 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: Sat, 04 Dec 2004 02:48:46 -0000

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

Change 66383 by sam@sam_ebb on 2004/12/04 02:48:01

	o clear global crypto keys when going to init state
	o add hack to catch a bogus state transition

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#13 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#13 (text+ko) ====

@@ -849,6 +849,10 @@
 				break;
 			case IEEE80211_M_HOSTAP:
 				nt = ic->ic_sta;
+				if (nt == NULL) {	/* XXX cannot happen */
+					if_printf(ifp, "no sta table (run)\n");
+					break;
+				}
 				IEEE80211_NODE_LOCK(nt);
 				TAILQ_FOREACH(ni, &nt->nt_node, ni_list) {
 					if (ni->ni_associd == 0)
@@ -872,6 +876,10 @@
 				break;
 			case IEEE80211_M_HOSTAP:
 				nt = ic->ic_sta;
+				if (nt == NULL) {	/* XXX cannot happen */
+					if_printf(ifp, "no sta table (assoc)\n");
+					break;
+				}
 				IEEE80211_NODE_LOCK(nt);
 				TAILQ_FOREACH(ni, &nt->nt_node, ni_list) {
 					IEEE80211_SEND_MGMT(ic, ni,
@@ -890,6 +898,7 @@
 			ic->ic_mgt_timer = 0;
 			IF_DRAIN(&ic->ic_mgtq);
 			ieee80211_reset_bss(ic);
+			ieee80211_crypto_delglobalkeys(ic);
 			break;
 		}
 		if (ic->ic_auth->ia_detach != NULL)