From owner-p4-projects@FreeBSD.ORG  Sun Mar 11 08:01:15 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 54FB516A407; Sun, 11 Mar 2007 08:01:15 +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 F2D5C16A404
	for <perforce@freebsd.org>; Sun, 11 Mar 2007 08:01:14 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E034613C471
	for <perforce@freebsd.org>; Sun, 11 Mar 2007 08:01:14 +0000 (UTC)
	(envelope-from sam@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 l2B81ErG091532
	for <perforce@freebsd.org>; Sun, 11 Mar 2007 08:01:14 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l2B81EiS091520
	for perforce@freebsd.org; Sun, 11 Mar 2007 08:01:14 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 11 Mar 2007 08:01:14 GMT
Message-Id: <200703110801.l2B81EiS091520@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 115712 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: Sun, 11 Mar 2007 08:01:15 -0000

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

Change 115712 by sam@sam_ebb on 2007/03/11 08:00:25

	correct modecaps checks

Affected files ...

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

Differences ...

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

@@ -2653,8 +2653,6 @@
 static int
 iwi_scan(struct iwi_softc *sc)
 {
-#define	IEEE80211_MODE_5GHZ	(1<<IEEE80211_MODE_11A)
-#define	IEEE80211_MODE_2GHZ	((1<<IEEE80211_MODE_11B)|1<<IEEE80211_MODE_11G)
 	struct ieee80211com *ic = &sc->sc_ic;
 	const struct ieee80211_channel *c;
 	struct iwi_scan_ext scan;
@@ -2689,7 +2687,7 @@
 		scan_type = IWI_SCAN_TYPE_BROADCAST;
 
 	ix = 0;
-	if (isset(ic->ic_modecaps, IEEE80211_MODE_5GHZ)) {
+	if (isset(ic->ic_modecaps, IEEE80211_MODE_11A)) {
 		start = ix;
 		for (i = 0; i <= IEEE80211_CHAN_MAX; i++) {
 			c = &ic->ic_channels[i];
@@ -2713,7 +2711,7 @@
 			ix++;
 		}
 	}
-	if (isset(ic->ic_modecaps, IEEE80211_MODE_2GHZ)) {
+	if (isset(ic->ic_modecaps, IEEE80211_MODE_11B)) {
 		start = ix;
 		for (i = 0; i <= IEEE80211_CHAN_MAX; i++) {
 			c = &ic->ic_channels[i];
@@ -2741,8 +2739,6 @@
 	sc->sc_ifp->if_timer = 1;
 	sc->flags |= IWI_FLAG_SCANNING;
 	return iwi_cmd(sc, IWI_CMD_SCAN_EXT, &scan, sizeof scan);
-#undef IEEE80211_MODE_5GHZ
-#undef IEEE80211_MODE_2GHZ
 }
 
 static void