From owner-p4-projects@FreeBSD.ORG  Fri Feb 15 05:53:25 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0BDCB16A420; Fri, 15 Feb 2008 05:53:25 +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 C385D16A41B
	for <perforce@FreeBSD.org>; Fri, 15 Feb 2008 05:53:24 +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 A6B3313C44B
	for <perforce@FreeBSD.org>; Fri, 15 Feb 2008 05:53:24 +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 m1F5rOUT005737
	for <perforce@FreeBSD.org>; Fri, 15 Feb 2008 05:53:24 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1F5rON0005734
	for perforce@freebsd.org; Fri, 15 Feb 2008 05:53:24 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Fri, 15 Feb 2008 05:53:24 GMT
Message-Id: <200802150553.m1F5rON0005734@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 135426 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: Fri, 15 Feb 2008 05:53:25 -0000

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

Change 135426 by sephe@sephe_zealot:sam_wifi on 2008/02/15 05:52:45

	Do TX rate control only for packets that need MAC level ack
	
	Obtained from: sam

Affected files ...

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

Differences ...

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

@@ -3175,13 +3175,17 @@
 	ni = tb->tb_ni;
 	if (tb->tb_ni != NULL) {
 		struct bwi_node *bn = (struct bwi_node *) tb->tb_ni;
+		const struct bwi_txbuf_hdr *hdr =
+		    mtod(tb->tb_mbuf, const struct bwi_txbuf_hdr *);
 
-		/* XXX only for unicast frames */
-		/* Feed back 'acked and data_txcnt' */
-		if (acked)
-			bn->amn.amn_success++;
-		bn->amn.amn_txcnt++;
-		bn->amn.amn_retrycnt += data_txcnt-1;
+		/* 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)
+				bn->amn.amn_success++;
+			bn->amn.amn_txcnt++;
+			bn->amn.amn_retrycnt += data_txcnt-1;
+		}
 
 		/*
 		 * Do any tx complete callback.  Note this must