From owner-svn-src-all@FreeBSD.ORG  Sat Apr  7 05:46:01 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 928151065674;
	Sat,  7 Apr 2012 05:46:01 +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 7D74A8FC12;
	Sat,  7 Apr 2012 05:46:01 +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 q375k17P045472;
	Sat, 7 Apr 2012 05:46:01 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q375k1QK045470;
	Sat, 7 Apr 2012 05:46:01 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201204070546.q375k1QK045470@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 7 Apr 2012 05:46:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233988 - head/sys/dev/ath
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Apr 2012 05:46:01 -0000

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