PERFORCE change 127086 for review

[Andrew Thompson]

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

Change 127086 by thompsa at thompsa_heff on 2007/10/02 03:54:06

	Move the INITED check to when the fw command is actaully issued, and
	use the ASSOCIATED to see if we are actually connected.

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#33 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#33 (text+ko) ====

@@ -850,12 +850,7 @@
 		return (*sc->sc_newstate)(ic, nstate, arg);
 
 	case IEEE80211_S_INIT:
-		/*
-		 * NB: don't try to do this if ipw_stop_master has
-		 *     shutdown the firmware and disabled interrupts.
-		 */
-		if (ic->ic_state == IEEE80211_S_RUN &&
-		    (sc->flags & IPW_FLAG_FW_INITED))
+		if (sc->flags & IPW_FLAG_ASSOCIATED)
 			taskqueue_enqueue_fast(taskqueue_fast,
 			    &sc->sc_disassoc_task);
 
@@ -2457,6 +2452,13 @@
 
 	DPRINTF(("Disassociate from %6D\n", ni->ni_bssid, ":"));
 
+	/*
+	 * NB: don't try to do this if ipw_stop_master has
+	 *     shutdown the firmware and disabled interrupts.
+	 */
+	if (sc->flags & IPW_FLAG_FW_INITED)
+		return (0);
+
 	sc->flags &= ~IPW_FLAG_ASSOCIATED;
 	/*
 	 * NB: firmware currently ignores bssid parameter, but