From owner-p4-projects@FreeBSD.ORG  Fri Mar  7 01:01:14 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CE139106567A; Fri,  7 Mar 2008 01:01:13 +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 8E0111065673
	for <perforce@freebsd.org>; Fri,  7 Mar 2008 01:01:13 +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 7CB638FC12
	for <perforce@freebsd.org>; Fri,  7 Mar 2008 01:01:13 +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 m2711D1f072073
	for <perforce@freebsd.org>; Fri, 7 Mar 2008 01:01:13 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2711De8072071
	for perforce@freebsd.org; Fri, 7 Mar 2008 01:01:13 GMT
	(envelope-from thompsa@freebsd.org)
Date: Fri, 7 Mar 2008 01:01:13 GMT
Message-Id: <200803070101.m2711De8072071@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 137041 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: Fri, 07 Mar 2008 01:01:14 -0000

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

Change 137041 by thompsa@thompsa_peeps on 2008/03/07 01:00:26

	Gah, save scheduling the taskqueue.

Affected files ...

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

Differences ...

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

@@ -3573,7 +3573,12 @@
 	struct ifnet *ifp = ic->ic_ifp;
 	struct wpi_softc *sc = ifp->if_softc;
 
-	wpi_queue_cmd(sc, WPI_SET_CHAN, 0, WPI_QUEUE_NORMAL);
+	/*
+	 * Only need to set the channel in Monitor mode. AP scanning and auth
+	 * are already taken care of by their respective firmware commands.
+	 */
+	if (ic->ic_opmode == IEEE80211_M_MONITOR)
+		wpi_queue_cmd(sc, WPI_SET_CHAN, 0, WPI_QUEUE_NORMAL);
 }
 
 /**
@@ -3667,17 +3672,10 @@
 		break;
 
 	case WPI_SET_CHAN:
-		/*
-		 * Only need to set the channel in Monitor mode. AP scanning
-		 * and auth are already taken care of by their respective
-		 * firmware commands.
-		 */
-		if (ic->ic_opmode == IEEE80211_M_MONITOR) {
-			error = wpi_config(sc);
-			if (error != 0)
-				device_printf(sc->sc_dev,
-				    "error %d settting channel\n", error);
-		}
+		error = wpi_config(sc);
+		if (error != 0)
+			device_printf(sc->sc_dev,
+			    "error %d settting channel\n", error);
 		break;
 
 	case WPI_AUTH: