From owner-svn-src-user@FreeBSD.ORG  Tue Aug 30 01:22:27 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 6CCB31065670;
	Tue, 30 Aug 2011 01:22:27 +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 5D4AF8FC13;
	Tue, 30 Aug 2011 01:22:27 +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 p7U1MRLA026548;
	Tue, 30 Aug 2011 01:22:27 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7U1MRsI026546;
	Tue, 30 Aug 2011 01:22:27 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201108300122.p7U1MRsI026546@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 30 Aug 2011 01:22:27 +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: r225253 - 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: Tue, 30 Aug 2011 01:22:27 -0000

Author: adrian
Date: Tue Aug 30 01:22:27 2011
New Revision: 225253
URL: http://svn.freebsd.org/changeset/base/225253

Log:
  * Add an RTS/CTS handling comment when forming aggregates;
  * Re-enable a comment - I think there are issues forming large
    aggregates

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

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.c	Mon Aug 29 22:55:37 2011	(r225252)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.c	Tue Aug 30 01:22:27 2011	(r225253)
@@ -291,11 +291,9 @@ ath_tx_rate_fill_rcflags(struct ath_soft
 			    ath_max_4ms_framelen[j][HT_RC_2_MCS(rate)];
 		} else
 			rc[i].max4msframelen = 0;
-#if 0
 		DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR,
 		    "%s: i=%d, rate=0x%x, flags=0x%x, max4ms=%d\n",
 		    __func__, i, rate, rc[i].flags, rc[i].max4msframelen);
-#endif
 	}
 }
 
@@ -755,6 +753,11 @@ ath_tx_form_aggr(struct ath_softc *sc, s
 		bf->bf_state.bfs_addedbaw = 1;
 
 		/*
+		 * XXX TODO: If any frame in the aggregate requires RTS/CTS,
+		 * set the first frame.
+		 */
+
+		/*
 		 * Add the now owned buffer (which isn't
 		 * on the software TXQ any longer) to our
 		 * aggregate frame list.