From owner-svn-src-user@FreeBSD.ORG  Mon Aug 22 06:27:45 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE3D51065672;
	Mon, 22 Aug 2011 06:27:45 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DED6A8FC0A;
	Mon, 22 Aug 2011 06:27:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7M6RjqO037165;
	Mon, 22 Aug 2011 06:27:45 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7M6Rjsu037163;
	Mon, 22 Aug 2011 06:27:45 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201108220627.p7M6Rjsu037163@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 22 Aug 2011 06:27:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225073 - user/adrian/if_ath_tx/sys/dev/ath
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Aug 2011 06:27:46 -0000

Author: adrian
Date: Mon Aug 22 06:27:45 2011
New Revision: 225073
URL: http://svn.freebsd.org/changeset/base/225073

Log:
  Don't call the rate control update code if the frame didn't
  require an ACK.
  
  Since aggregate frames require an ACK, don't worry about
  doing the checks there.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Mon Aug 22 06:25:01 2011	(r225072)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Mon Aug 22 06:27:45 2011	(r225073)
@@ -2189,9 +2189,9 @@ ath_tx_normal_comp(struct ath_softc *sc,
 
 	/*
 	 * punt to rate control if we're not being cleaned up
-	 * during a hw queue drain.
+	 * during a hw queue drain and the frame wanted an ACK.
 	 */
-	if (fail == 0)
+	if (fail == 0 && ((bf->bf_txflags & HAL_TXDESC_NOACK) == 0))
 		ath_tx_update_ratectrl(sc, ni, bf->bf_state.bfs_rc,
 		    ts, bf->bf_state.bfs_pktlen,
 		    1, (ts->ts_status == 0) ? 0 : 1);
@@ -2821,7 +2821,7 @@ ath_tx_aggr_comp_unaggr(struct ath_softc
 	 * Update rate control status here, before we possibly
 	 * punt to retry or cleanup.
 	 */
-	if (fail == 0)
+	if (fail == 0 && ((bf->bf_txflags & HAL_TXDESC_NOACK) == 0))
 		ath_tx_update_ratectrl(sc, ni, bf->bf_state.bfs_rc,
 		    &bf->bf_status.ds_txstat,
 		    bf->bf_state.bfs_pktlen,