From owner-p4-projects@FreeBSD.ORG  Fri Jan  9 12:01:18 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B62D016A4D3; Fri,  9 Jan 2004 12:01:17 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 62C1A16A4D0
	for <perforce@freebsd.org>; Fri,  9 Jan 2004 12:01:17 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 70D2D43D46
	for <perforce@freebsd.org>; Fri,  9 Jan 2004 12:01:15 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i09K1F0B052256
	for <perforce@freebsd.org>; Fri, 9 Jan 2004 12:01:15 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i09K1E6O052253
	for perforce@freebsd.org; Fri, 9 Jan 2004 12:01:15 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Fri, 9 Jan 2004 12:01:15 -0800 (PST)
Message-Id: <200401092001.i09K1E6O052253@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>
Subject: PERFORCE change 45027 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 09 Jan 2004 20:01:18 -0000

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

Change 45027 by sam@sam_ebb on 2004/01/09 12:01:07

	trust the xmit retry counts that are returned for the xmit
	descriptors; this makes the rate control algorithm do a better
	job of tracking rssi (but should be using rssi directly anyway)

Affected files ...

.. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#11 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#11 (text+ko) ====

@@ -2263,8 +2263,7 @@
 			lr = ds->ds_txstat.ts_longretry;
 			sc->sc_stats.ast_tx_shortretry += sr;
 			sc->sc_stats.ast_tx_longretry += lr;
-			if (sr + lr)
-				an->an_tx_retr++;
+			an->an_tx_retr += sr + lr;
 			/*
 			 * Reclaim reference to node.
 			 *