PERFORCE change 121245 for review

[Andrew Thompson]

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

Change 121245 by thompsa at 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;