PERFORCE change 127127 for review

[Andrew Thompson]

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

Change 127127 by thompsa at thompsa_heff on 2007/10/03 08:48:35

	Pass all state changes through ieee80211_newstate.

Affected files ...

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

Differences ...

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

@@ -851,14 +851,13 @@
 	switch (nstate) {
 	case IEEE80211_S_SCAN:
 	case IEEE80211_S_RUN:
-		return (*sc->sc_newstate)(ic, nstate, arg);
+		break;
 
 	case IEEE80211_S_INIT:
 		if (sc->flags & IPW_FLAG_ASSOCIATED)
 			taskqueue_enqueue_fast(taskqueue_fast,
 			    &sc->sc_disassoc_task);
-
-		return sc->sc_newstate(ic, nstate, arg);
+		break;
 
 	case IEEE80211_S_AUTH:
 		taskqueue_enqueue_fast(taskqueue_fast, &sc->sc_assoc_task);
@@ -877,9 +876,7 @@
 	default:
 		break;
 	}
-	ic->ic_state = nstate;
-
-	return 0;
+	return (*sc->sc_newstate)(ic, nstate, arg);
 }
 
 /*