From owner-p4-projects@FreeBSD.ORG  Wed Feb  7 18:50:01 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 5A5FC16A40E; Wed,  7 Feb 2007 18:49:59 +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 B182D16A40B
	for <perforce@freebsd.org>; Wed,  7 Feb 2007 18:49:58 +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 A256E13C442
	for <perforce@freebsd.org>; Wed,  7 Feb 2007 18:49:58 +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 l17InwQC039454
	for <perforce@freebsd.org>; Wed, 7 Feb 2007 18:49:58 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l17InwNc039451
	for perforce@freebsd.org; Wed, 7 Feb 2007 18:49:58 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 7 Feb 2007 18:49:58 GMT
Message-Id: <200702071849.l17InwNc039451@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 114197 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, 07 Feb 2007 18:50:01 -0000

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

Change 114197 by sam@sam_ebb on 2007/02/07 18:49:20

	oops, this explains why the sr9 didn't scan properly

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#14 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_var.h#45 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#14 (text+ko) ====

@@ -693,13 +693,7 @@
 
 	okrate = badrate = fixedrate = 0;
 
-	if (IEEE80211_IS_CHAN_HALF(se->se_chan)) {
-		srs = &ic->ic_sup_half_rates;
-	} else if (IEEE80211_IS_CHAN_QUARTER(se->se_chan)) {
-		srs = &ic->ic_sup_quarter_rates;
-	} else {
-		srs = &ic->ic_sup_rates[ieee80211_chan2mode(se->se_chan)];
-	}
+	srs = ieee80211_get_suprates(ic, se->se_chan);
 	nrs = se->se_rates[1];
 	rs = se->se_rates+2;
 	fixedrate = IEEE80211_FIXED_RATE_NONE;

==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#45 (text+ko) ====

@@ -114,8 +114,6 @@
 	u_int16_t		ic_modecaps;	/* set of mode capabilities */
 	u_int16_t		ic_curmode;	/* current mode */
 	struct ieee80211_rateset ic_sup_rates[IEEE80211_MODE_MAX];
-	struct ieee80211_rateset ic_sup_half_rates;
-	struct ieee80211_rateset ic_sup_quarter_rates;
 	u_int16_t		ic_bintval;	/* beacon interval */
 	u_int16_t		ic_lintval;	/* listen interval */
 	u_int16_t		ic_holdover;	/* PM hold over duration */