From owner-p4-projects@FreeBSD.ORG  Sat Feb 16 08:37:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2338016A41A; Sat, 16 Feb 2008 08:37:24 +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 DCE2316A418
	for <perforce@FreeBSD.org>; Sat, 16 Feb 2008 08:37:23 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E2FD413C467
	for <perforce@FreeBSD.org>; Sat, 16 Feb 2008 08:37:23 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1G8bNWV003109
	for <perforce@FreeBSD.org>; Sat, 16 Feb 2008 08:37:23 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1G8bNwJ003106
	for perforce@freebsd.org; Sat, 16 Feb 2008 08:37:23 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Sat, 16 Feb 2008 08:37:23 GMT
Message-Id: <200802160837.m1G8bNwJ003106@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 135481 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: Sat, 16 Feb 2008 08:37:24 -0000

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

Change 135481 by sephe@sephe_zealot:sam_wifi on 2008/02/16 08:36:49

	Don't claim that we are successful with the current rate picked up by
	amrr even if all transmission at the current rate failed.

Affected files ...

.. //depot/projects/wifi/sys/dev/bwi/if_bwi.c#21 edit

Differences ...

==== //depot/projects/wifi/sys/dev/bwi/if_bwi.c#21 (text+ko) ====

@@ -3018,9 +3018,16 @@
 	else if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) {
 		rate = ni->ni_rates.rs_rates[ni->ni_txrate] & 
 		    IEEE80211_RATE_VAL;
-		rate_fb = (ni->ni_txrate > 0) ?
-		   ni->ni_rates.rs_rates[ni->ni_txrate-1] & 
-		       IEEE80211_RATE_VAL : rate;
+		tb->tb_rate_idx[0] = ni->ni_txrate;
+
+		if (ni->ni_txrate > 0) {
+			rate_fb = ni->ni_rates.rs_rates[ni->ni_txrate - 1] &
+				  IEEE80211_RATE_VAL;
+			tb->tb_rate_idx[1] = ni->ni_txrate - 1;
+		} else {
+			rate_fb = rate;
+			tb->tb_rate_idx[1] = tb->tb_rate_idx[0];
+		}
 	} else
 		rate = rate_fb = ic->ic_fixed_rate;
 
@@ -3240,7 +3247,9 @@
 		/* NB: update rate control only for unicast frames */
 		if (hdr->txh_mac_ctrl & htole32(BWI_TXH_MAC_C_ACK)) {
 			/* Feed back 'acked and data_txcnt' */
-			if (acked)
+			if (acked &&
+			    (data_txcnt <= BWI_SHRETRY_FB ||
+			     tb->tb_rate_idx[0] == tb->tb_rate_idx[1]))
 				bn->amn.amn_success++;
 			bn->amn.amn_txcnt++;
 			bn->amn.amn_retrycnt += data_txcnt-1;