From owner-p4-projects@FreeBSD.ORG  Thu Mar  6 22:06:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4662610656E7; Thu,  6 Mar 2008 22:06:56 +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 01A4A10656BF
	for <perforce@freebsd.org>; Thu,  6 Mar 2008 22:06: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 E42BB8FC24
	for <perforce@freebsd.org>; Thu,  6 Mar 2008 22:06:55 +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 m26M6tEI053864
	for <perforce@freebsd.org>; Thu, 6 Mar 2008 22:06:55 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m26M6tlk053862
	for perforce@freebsd.org; Thu, 6 Mar 2008 22:06:55 GMT
	(envelope-from thompsa@freebsd.org)
Date: Thu, 6 Mar 2008 22:06:55 GMT
Message-Id: <200803062206.m26M6tlk053862@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 137031 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: Thu, 06 Mar 2008 22:06:57 -0000

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

Change 137031 by thompsa@thompsa_peeps on 2008/03/06 22:06:48

	Allow setting the channel in monitor mode, AP scanning/auth are
	already taken care of by their respective firmware commands.
	
	Discussed with:		sam

Affected files ...

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

Differences ...

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

@@ -3667,8 +3667,17 @@
 		break;
 
 	case WPI_SET_CHAN:
-		/* XXX Is this needed ? */
-		DPRINTF(("Ignoring WPI_SET_CHAN\n"));
+		/*
+		 * Only need to set the channel in Monitor mode. The scanning
+		 * firmware command lists the channel and the AP channel is
+		 * set in wpi_auth().
+		 */
+		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);
+		}
 		break;
 
 	case WPI_AUTH: