From owner-p4-projects@FreeBSD.ORG  Wed Mar  5 23:07:05 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 626181065671; Wed,  5 Mar 2008 23:07:05 +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 22009106566B
	for <perforce@freebsd.org>; Wed,  5 Mar 2008 23:07:05 +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 1B1348FC14
	for <perforce@freebsd.org>; Wed,  5 Mar 2008 23:07:05 +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 m25N74bc012727
	for <perforce@freebsd.org>; Wed, 5 Mar 2008 23:07:04 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m25N74Mq012725
	for perforce@freebsd.org; Wed, 5 Mar 2008 23:07:04 GMT
	(envelope-from thompsa@freebsd.org)
Date: Wed, 5 Mar 2008 23:07:04 GMT
Message-Id: <200803052307.m25N74Mq012725@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 136956 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:07:05 -0000

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

Change 136956 by thompsa@thompsa_peeps on 2008/03/05 23:06:28

	- Add a missing break on IEEE80211_S_AUTH which made things interesting
	- Make sure to set the callout in wpi_run, we dont reenter wpi_newstate

Affected files ...

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

Differences ...

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

@@ -1263,6 +1263,7 @@
 		if (ic->ic_state != IEEE80211_S_AUTH)
 			return wpi_queue_cmd(sc, WPI_AUTH, arg,
 			    WPI_QUEUE_NORMAL);
+		break;
 
 	case IEEE80211_S_RUN:
 		if (ic->ic_opmode == IEEE80211_M_MONITOR) {
@@ -1274,9 +1275,6 @@
 			/* set the association id first */
 			return wpi_queue_cmd(sc, WPI_RUN, arg,
 			    WPI_QUEUE_NORMAL);
-
-		/* start automatic rate control timer */
-		callout_reset(&sc->calib_to, hz/2, wpi_calib_timeout, sc);
 		break;
 
 	default:
@@ -2507,6 +2505,9 @@
 	/* link LED always on while associated */
 	wpi_set_led(sc, WPI_LED_LINK, 0, 1);
 
+	/* start automatic rate control timer */
+	callout_reset(&sc->calib_to, hz/2, wpi_calib_timeout, sc);
+
 	return (error);
 }