From owner-p4-projects@FreeBSD.ORG  Fri Jan  9 15:27:47 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BFE4E16A4D1; Fri,  9 Jan 2004 15:27:46 -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 9517216A4CE
	for <perforce@freebsd.org>; Fri,  9 Jan 2004 15:27:46 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4BA5143D41
	for <perforce@freebsd.org>; Fri,  9 Jan 2004 15:27:32 -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 i09NRW0B006548
	for <perforce@freebsd.org>; Fri, 9 Jan 2004 15:27:32 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i09NRVJc006545
	for perforce@freebsd.org; Fri, 9 Jan 2004 15:27:31 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Fri, 9 Jan 2004 15:27:31 -0800 (PST)
Message-Id: <200401092327.i09NRVJc006545@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 45041 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 23:27:47 -0000

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

Change 45041 by sam@sam_ebb on 2004/01/09 15:26:52

	workaround h/w limitation

Affected files ...

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

Differences ...

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

@@ -2177,6 +2177,24 @@
 			__func__, i, ds->ds_link, ds->ds_data,
 			ds->ds_ctl0, ds->ds_ctl1, ds->ds_hw[0], ds->ds_hw[1]));
 	}
+	if (try0 != ATH_TXMAXTRY && bf->bf_nseg > 1) {
+		/*
+		 * Copy the try counts to the final descriptor if
+		 * we're doing multi-rate retry and multiple descriptors
+		 * are being used.  This permits the hal to properly
+		 * calculate the retry count.  Otherwise it doesn't
+		 * have the information available because it only gets
+		 * the last descriptor and this info is in the first.
+		 * The driver can't calculate this because it doesn't
+		 * know about the format of the xmit descriptor.  Sigh,
+		 * would've been nice for the hardware to do this for us.
+		 */
+		ath_hal_setupxtxdesc(ah, --ds
+			, an->an_tx_rate1sp, 2	/* series 1 */
+			, an->an_tx_rate2sp, 2	/* series 2 */
+			, an->an_tx_rate3sp, 2	/* series 3 */
+		);
+	}
 
 	/*
 	 * Insert the frame on the outbound list and