From owner-p4-projects@FreeBSD.ORG  Wed Jan  3 06:04:33 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 83D9616A40F; Wed,  3 Jan 2007 06:04:33 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5CBF116A403
	for <perforce@freebsd.org>; Wed,  3 Jan 2007 06:04:33 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 4ED2913C45E
	for <perforce@freebsd.org>; Wed,  3 Jan 2007 06:04:33 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0364XHg076902
	for <perforce@freebsd.org>; Wed, 3 Jan 2007 06:04:33 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0364XVR076897
	for perforce@freebsd.org; Wed, 3 Jan 2007 06:04:33 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 3 Jan 2007 06:04:33 GMT
Message-Id: <200701030604.l0364XVR076897@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112445 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, 03 Jan 2007 06:04:33 -0000

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

Change 112445 by kmacy@kmacy_serendipity:sam_wifi on 2007/01/03 06:04:14

	fix "firmware error" complaints 
	the channel index is no longer the same as the IEEE channel

Affected files ...

.. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#17 edit

Differences ...

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

@@ -2753,7 +2753,7 @@
 			    !(isset(ic->ic_chan_scan,i) || c == ic->ic_curchan))
 				continue;
 			ix++;
-			scan.channels[ix] = i;
+			scan.channels[ix] = c->ic_ieee;
 			if (c->ic_flags & IEEE80211_CHAN_PASSIVE)
 				set_scan_type(&scan, ix, IWI_SCAN_TYPE_PASSIVE);
 			else
@@ -2773,7 +2773,7 @@
 			    !(isset(ic->ic_chan_scan,i) || c == ic->ic_curchan))
 				continue;
 			ix++;
-			scan.channels[ix] = i;
+			scan.channels[ix] = c->ic_ieee;
 			if (c->ic_flags & IEEE80211_CHAN_PASSIVE)
 				set_scan_type(&scan, ix, IWI_SCAN_TYPE_PASSIVE);
 			else