From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 08:49:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1854C16A474; Wed,  3 Oct 2007 08:49:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BE50A16A46B
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 08:49:11 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B38A713C4C8
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 08:49:11 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l938nBkO009480
	for <perforce@freebsd.org>; Wed, 3 Oct 2007 08:49:11 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l938nBeZ009477
	for perforce@freebsd.org; Wed, 3 Oct 2007 08:49:11 GMT
	(envelope-from thompsa@freebsd.org)
Date: Wed, 3 Oct 2007 08:49:11 GMT
Message-Id: <200710030849.l938nBeZ009477@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 127127 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: Wed, 03 Oct 2007 08:49:12 -0000

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

Change 127127 by thompsa@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);
 }
 
 /*