From owner-p4-projects@FreeBSD.ORG  Sun Dec  7 21:41:02 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9275C16A4D0; Sun,  7 Dec 2003 21:41:02 -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 6D18116A4CE
	for <perforce@freebsd.org>; Sun,  7 Dec 2003 21:41:02 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E19EF43FFB
	for <perforce@freebsd.org>; Sun,  7 Dec 2003 21:40:56 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB85euXJ041291
	for <perforce@freebsd.org>; Sun, 7 Dec 2003 21:40:56 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB85euGk041288
	for perforce@freebsd.org; Sun, 7 Dec 2003 21:40:56 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Sun, 7 Dec 2003 21:40:56 -0800 (PST)
Message-Id: <200312080540.hB85euGk041288@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 43607 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: Mon, 08 Dec 2003 05:41:03 -0000

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

Change 43607 by sam@sam_ebb on 2003/12/07 21:40:38

	try 2 stage stepdown w/o resorting to the lowest rate

Affected files ...

.. //depot/projects/netperf/sys/dev/ath/if_ath.c#47 edit

Differences ...

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

@@ -2729,6 +2729,9 @@
 	/* XXX management/control frames always go at the lowest speed */
 	an->an_tx_mgtrate = rt->info[0].rateCode;
 	an->an_tx_mgtratesp = an->an_tx_mgtrate | rt->info[0].shortPreamble;
+	/*
+	 * Setup two step-down retry rates.
+	 */
 	if (--rate >= 0) {
 		rix = sc->sc_rixmap[
 			ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL];
@@ -2737,7 +2740,6 @@
 			rt->info[rix].shortPreamble;
 	} else
 		an->an_tx_rate1 = 0;
-#if 0
 	if (--rate >= 0) {
 		rix = sc->sc_rixmap[
 			ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL];
@@ -2746,6 +2748,7 @@
 			rt->info[rix].shortPreamble;
 	} else
 		an->an_tx_rate2 = 0;
+#if 0
 	if (--rate >= 0) {
 		rix = sc->sc_rixmap[
 			ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL];
@@ -2754,9 +2757,9 @@
 			rt->info[rix].shortPreamble;
 	} else
 		an->an_tx_rate3 = 0;
-#else
 	an->an_tx_rate2 = an->an_tx_mgtrate;
 	an->an_tx_rate2sp = an->an_tx_mgtratesp;
+#else
 	an->an_tx_rate3 = an->an_tx_rate3sp = 0;
 #endif
 	an->an_tx_ok = an->an_tx_err = an->an_tx_retr = an->an_tx_upper = 0;