svn commit: r225073 - user/adrian/if_ath_tx/sys/dev/ath

[Adrian Chadd]

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,