From owner-svn-src-user@FreeBSD.ORG  Mon Sep  5 10:09:53 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 C3E3A1065689;
	Mon,  5 Sep 2011 10:09:53 +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 B32648FC18;
	Mon,  5 Sep 2011 10:09:53 +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 p85A9rS3031035;
	Mon, 5 Sep 2011 10:09:53 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p85A9r6a031033;
	Mon, 5 Sep 2011 10:09:53 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109051009.p85A9r6a031033@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 5 Sep 2011 10:09:53 +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: r225393 - 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: Mon, 05 Sep 2011 10:09:53 -0000

Author: adrian
Date: Mon Sep  5 10:09:53 2011
New Revision: 225393
URL: http://svn.freebsd.org/changeset/base/225393

Log:
  Hacky work around for now - disable the last rate series entry
  when forming aggregates. This is a very low MCS rate in all MCS
  instances and the 4ms frame length limit ends up being quite low.
  Thus larger aggregates don't get a chance to form.
  
  This isn't optimal..

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 Sep  5 09:49:28 2011	(r225392)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Mon Sep  5 10:09:53 2011	(r225393)
@@ -3190,6 +3190,8 @@ ath_tx_tid_hw_queue_aggr(struct ath_soft
 		 * the size of the first frame.
 		 */
 		ath_tx_do_ratelookup(sc, bf);
+		bf->bf_state.bfs_rc[3].rix = 0;
+		bf->bf_state.bfs_rc[3].tries = 0;
 		ath_tx_rate_fill_rcflags(sc, bf);
 
 		status = ath_tx_form_aggr(sc, an, tid, &bf_q);