svn commit: r233988 - head/sys/dev/ath

[Adrian Chadd]

Author: adrian
Date: Sat Apr  7 05:46:00 2012
New Revision: 233988
URL: http://svn.freebsd.org/changeset/base/233988

Log:
  As I thought, this is a bad idea. When forming aggregates, the RTS/CTS
  stuff and rate control lookup is only done on the first frame.

Modified:
  head/sys/dev/ath/if_ath_tx_ht.c

Modified: head/sys/dev/ath/if_ath_tx_ht.c
==============================================================================
--- head/sys/dev/ath/if_ath_tx_ht.c	Sat Apr  7 05:43:50 2012	(r233987)
+++ head/sys/dev/ath/if_ath_tx_ht.c	Sat Apr  7 05:46:00 2012	(r233988)
@@ -741,18 +741,14 @@ ath_tx_form_aggr(struct ath_softc *sc, s
 
 		/*
 		 * If the current frame has an RTS/CTS configuration
-		 * that differs from the first frame, don't include
-		 * this in the aggregate.  It's possible that the
-		 * "right" thing to do here is enforce the aggregate
-		 * configuration.
-		 */
-		if ((bf_first->bf_state.bfs_txflags &
-		    (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA)) !=
-		   (bf->bf_state.bfs_txflags &
-		    (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA))) {
-			status = ATH_AGGR_NONAGGR;
-			break;
-		}
+		 * that differs from the first frame, override the
+		 * subsequent frame with this config.
+		 */
+		bf->bf_state.bfs_txflags &=
+		    (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA);
+		bf->bf_state.bfs_txflags |=
+		    bf_first->bf_state.bfs_txflags &
+		    (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA);
 
 		/*
 		 * TODO: If it's _before_ the BAW left edge, complain very