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

[Adrian Chadd]

Author: adrian
Date: Wed Aug 31 05:19:31 2011
New Revision: 225280
URL: http://svn.freebsd.org/changeset/base/225280

Log:
  Don't clear the MRR fields for aggregate frames.
  
  This allows for faster recovery if higher MCS rates begin to fail,
  as lower MCS rates are now tried.
  
  There are still issues forming large aggregates because of the logic
  involved in selecting the largest aggregate frame size (which is
  based on the lowest 4ms frame length value in the rate series),
  but that's a later issue to solve.

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	Wed Aug 31 04:57:11 2011	(r225279)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Wed Aug 31 05:19:31 2011	(r225280)
@@ -3202,19 +3202,6 @@ ath_tx_tid_hw_queue_aggr(struct ath_soft
 			sc->sc_stats.tx_aggr.aggr_pkts[bf->bf_state.bfs_nframes]++;
 			sc->sc_stats.tx_aggr.aggr_aggr_pkt++;
 
-			/* Set rate 1, 2, 3 to 0 for aggregate frames */
-			bf->bf_state.bfs_rc[1].rix =
-			bf->bf_state.bfs_rc[2].rix =
-			bf->bf_state.bfs_rc[3].rix = 0;
-
-			bf->bf_state.bfs_rc[1].ratecode =
-			bf->bf_state.bfs_rc[2].ratecode =
-			bf->bf_state.bfs_rc[3].ratecode = 0;
-
-			bf->bf_state.bfs_rc[1].tries =
-			bf->bf_state.bfs_rc[2].tries =
-			bf->bf_state.bfs_rc[3].tries = 0;
-
 			/*
 			 * Setup the relevant descriptor fields
 			 * for aggregation. The first descriptor