From owner-p4-projects@FreeBSD.ORG  Sat Jun  9 03:04:34 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C967616A468; Sat,  9 Jun 2007 03:04:33 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A3C0716A421
	for <perforce@freebsd.org>; Sat,  9 Jun 2007 03:04:33 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F91713C46A
	for <perforce@freebsd.org>; Sat,  9 Jun 2007 03:04:33 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5934Xje040202
	for <perforce@freebsd.org>; Sat, 9 Jun 2007 03:04:33 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5934XhZ040192
	for perforce@freebsd.org; Sat, 9 Jun 2007 03:04:33 GMT
	(envelope-from thompsa@freebsd.org)
Date: Sat, 9 Jun 2007 03:04:33 GMT
Message-Id: <200706090304.l5934XhZ040192@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 121245 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: Sat, 09 Jun 2007 03:04:34 -0000

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

Change 121245 by thompsa@thompsa_heff on 2007/06/09 03:04:23

	Improve check for disassociate.

Affected files ...

.. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#43 edit
.. //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#11 edit

Differences ...

==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#43 (text+ko) ====

@@ -1471,10 +1471,19 @@
 			ieee80211_new_state(ic, IEEE80211_S_RUN, -1);
 			break;
 
-		case IWI_ASSOC_FAIL:
-			DPRINTFN(2, ("Association failed\n"));
+		case IWI_ASSOC_INIT:
+			switch (ic->ic_state) {
+				case IEEE80211_S_ASSOC:
+					DPRINTFN(2, ("Association failed\n"));
+					ieee80211_new_state(ic,
+					    IEEE80211_S_SCAN, -1);
+					break;
+
+				case IEEE80211_S_RUN:
+					DPRINTFN(2, ("Disassociated\n"));
+					break;
+			}
 			sc->flags &= ~IWI_FLAG_ASSOCIATED;
-			ieee80211_new_state(ic, IEEE80211_S_SCAN, -1);
 			break;
 
 		default:

==== //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#11 (text+ko) ====

@@ -213,7 +213,7 @@
 /* structure for notification IWI_NOTIF_TYPE_ASSOCIATION */
 struct iwi_notif_association {
 	uint8_t			state;
-#define IWI_ASSOC_FAIL		0
+#define IWI_ASSOC_INIT		0
 #define IWI_ASSOC_SUCCESS	12
 	uint8_t			pad[11];
 } __packed;