PERFORCE change 43607 for review

[Sam Leffler]

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

Change 43607 by sam at 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;