From owner-p4-projects@FreeBSD.ORG  Fri Nov  7 17:06:15 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D8A631065673; Fri,  7 Nov 2008 17:06:14 +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 9CE51106564A
	for <perforce@freebsd.org>; Fri,  7 Nov 2008 17:06:14 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8CCEC8FC1E
	for <perforce@freebsd.org>; Fri,  7 Nov 2008 17:06:14 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA7H6E67007732
	for <perforce@freebsd.org>; Fri, 7 Nov 2008 17:06:14 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA7H6Em2007730
	for perforce@freebsd.org; Fri, 7 Nov 2008 17:06:14 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 7 Nov 2008 17:06:14 GMT
Message-Id: <200811071706.mA7H6Em2007730@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 152625 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 Nov 2008 17:06:15 -0000

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

Change 152625 by sam@sam_ebb on 2008/11/07 17:05:16

	skip unused rates when check for an initial rate; this fixes
	wrongly selecting an HT rate from the hal's rate table

Affected files ...

.. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#20 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#20 (text+ko) ====

@@ -280,6 +280,8 @@
 		if (!sn->packets_sent[size_bin] || best_rix == -1) {
 			/* no packet has been sent successfully yet */
 			for (rix = rt->rateCount-1; rix > 0; rix--) {
+				if ((sn->ratemask & (1<<rix)) == 0)
+					continue;
 				/* 
 				 * pick the highest rate <= 36 Mbps
 				 * that hasn't failed.