From owner-p4-projects@FreeBSD.ORG  Mon Feb 18 23:29:57 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 13D5216A421; Mon, 18 Feb 2008 23:29:57 +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 B1F6216A418
	for <perforce@freebsd.org>; Mon, 18 Feb 2008 23:29:56 +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 A76A513C4D1
	for <perforce@freebsd.org>; Mon, 18 Feb 2008 23:29:56 +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 m1INTu0F003072
	for <perforce@freebsd.org>; Mon, 18 Feb 2008 23:29:56 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1INTuiV003069
	for perforce@freebsd.org; Mon, 18 Feb 2008 23:29:56 GMT
	(envelope-from thompsa@freebsd.org)
Date: Mon, 18 Feb 2008 23:29:56 GMT
Message-Id: <200802182329.m1INTuiV003069@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 135683 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: Mon, 18 Feb 2008 23:29:57 -0000

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

Change 135683 by thompsa@thompsa_heff on 2008/02/18 23:29:07

	MF //depot/user/benjsc/wpi/sys/dev/wpi/if_wpi.c@131090
	Dont try to stop the callout.

Affected files ...

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

Differences ...

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

@@ -1333,9 +1333,9 @@
 	int error;
 	WPI_LOCK_DECL;
 
-	WPI_LOCK(sc);
-	callout_stop(&sc->calib_to);
-	WPI_UNLOCK(sc);
+	DPRINTF(("%s: %s -> %s\n", __func__,
+		 ieee80211_state_name[ic->ic_state],
+		 ieee80211_state_name[nstate]));
 
 	switch (nstate) {
 	case IEEE80211_S_SCAN:
@@ -3329,14 +3329,15 @@
 	int temp;
 	WPI_LOCK_DECL;
 
+	if ( ic->ic_state != IEEE80211_S_RUN )
+	    return;
+
 	/* automatic rate control triggered every 500ms */
 	if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) {
-		WPI_LOCK(sc);
 		if (ic->ic_opmode == IEEE80211_M_STA)
 			wpi_iter_func(sc, ic->ic_bss);
 		else
 			ieee80211_iterate_nodes(&ic->ic_sta, wpi_iter_func, sc);
-		WPI_UNLOCK(sc);
 	}
 
 	/* update sensor data */