From owner-svn-src-user@FreeBSD.ORG  Mon Sep  5 09:39:35 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 A92091065670;
	Mon,  5 Sep 2011 09:39:35 +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 97E898FC19;
	Mon,  5 Sep 2011 09:39:35 +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 p859dZkf030012;
	Mon, 5 Sep 2011 09:39:35 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p859dZcr030010;
	Mon, 5 Sep 2011 09:39:35 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109050939.p859dZcr030010@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 5 Sep 2011 09:39:35 +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: r225391 -
	user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample
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 09:39:35 -0000

Author: adrian
Date: Mon Sep  5 09:39:35 2011
New Revision: 225391
URL: http://svn.freebsd.org/changeset/base/225391

Log:
  Disable the code which also sets the successive_retries field
  for the larger size buckets.
  
  This is causing issues with 11n TX where aggregate frames can
  sometimes entirely fail. This started marking other rates as
  unavailable.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample/sample.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample/sample.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample/sample.c	Mon Sep  5 09:31:26 2011	(r225390)
+++ user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample/sample.c	Mon Sep  5 09:39:35 2011	(r225391)
@@ -742,9 +742,17 @@ update_stats(struct ath_softc *sc, struc
 			 (tt * (100 - ssc->smoothing_rate))) / 100;
 	}
 	
+	/*
+	 * XXX Don't mark the higher bit rates as also having failed; as this
+	 * unfortunately stops those rates from being tasted when trying to
+	 * TX. This happens with 11n aggregation.
+	 */
 	if (nframes == nbad) {
+#if 0
 		int y;
+#endif
 		sn->stats[size_bin][rix0].successive_failures += nbad;
+#if 0
 		for (y = size_bin+1; y < NUM_PACKET_SIZE_BINS; y++) {
 			/*
 			 * Also say larger packets failed since we
@@ -756,6 +764,7 @@ update_stats(struct ath_softc *sc, struc
 			sn->stats[y][rix0].tries += tries;
 			sn->stats[y][rix0].total_packets += nframes;
 		}
+#endif
 	} else {
 		sn->stats[size_bin][rix0].packets_acked += (nframes - nbad);
 		sn->stats[size_bin][rix0].successive_failures = 0;