From owner-p4-projects@FreeBSD.ORG  Wed Mar  5 23:22:21 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D87651065674; Wed,  5 Mar 2008 23:22:20 +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 9878E106566C
	for <perforce@freebsd.org>; Wed,  5 Mar 2008 23:22:20 +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 91B838FC1B
	for <perforce@freebsd.org>; Wed,  5 Mar 2008 23:22:20 +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 m25NMKwQ013374
	for <perforce@freebsd.org>; Wed, 5 Mar 2008 23:22:20 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m25NMK9s013372
	for perforce@freebsd.org; Wed, 5 Mar 2008 23:22:20 GMT
	(envelope-from thompsa@freebsd.org)
Date: Wed, 5 Mar 2008 23:22:20 GMT
Message-Id: <200803052322.m25NMK9s013372@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 136957 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, 05 Mar 2008 23:22:21 -0000

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

Change 136957 by thompsa@thompsa_peeps on 2008/03/05 23:22:18

	Always update the node table in the firmware for -> AUTH.

Affected files ...

.. //depot/projects/wifi/sys/dev/wpi/if_wpi.c#18 edit

Differences ...

==== //depot/projects/wifi/sys/dev/wpi/if_wpi.c#18 (text+ko) ====

@@ -1260,10 +1260,7 @@
 
 	case IEEE80211_S_AUTH:
 		/* Delay the auth transition until we can update the firmware */
-		if (ic->ic_state != IEEE80211_S_AUTH)
-			return wpi_queue_cmd(sc, WPI_AUTH, arg,
-			    WPI_QUEUE_NORMAL);
-		break;
+		return wpi_queue_cmd(sc, WPI_AUTH, arg, WPI_QUEUE_NORMAL);
 
 	case IEEE80211_S_RUN:
 		if (ic->ic_opmode == IEEE80211_M_MONITOR) {
@@ -1281,7 +1278,7 @@
 		break;
 	}
 
-	return (*sc->sc_newstate)(ic, nstate, arg);
+	return sc->sc_newstate(ic, nstate, arg);
 }
 
 /*