From owner-svn-src-all@FreeBSD.ORG  Thu Feb  3 20:26:26 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 870D4106564A;
	Thu,  3 Feb 2011 20:26:26 +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 775848FC17;
	Thu,  3 Feb 2011 20:26:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p13KQQWT057421;
	Thu, 3 Feb 2011 20:26:26 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p13KQQX2057419;
	Thu, 3 Feb 2011 20:26:26 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201102032026.p13KQQX2057419@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 3 Feb 2011 20:26:26 +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: r218238 - 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: Thu, 03 Feb 2011 20:26:26 -0000

Author: adrian
Date: Thu Feb  3 20:26:26 2011
New Revision: 218238
URL: http://svn.freebsd.org/changeset/base/218238

Log:
  Disable the code I previously added from Rui's 802.11n branch.
  
  A-MPDU RX interferes with packet retransmission/reordering.
  In local testing, I was seeing A-MPDU being negotiated and then
  not used by the AP sending frames to the STA; the STA would then
  treat non A-MPDU frames that are retransmits as out of the window
  and get plain confused.
  
  The hardware RX status descriptor has a "I'm part of an aggregate"
  bit; so this should eventually be tested and then punted to the
  A-MPDU reorder handling only if it has this bit set.

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

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Thu Feb  3 20:10:16 2011	(r218237)
+++ head/sys/dev/ath/if_ath.c	Thu Feb  3 20:26:26 2011	(r218238)
@@ -3892,9 +3892,15 @@ rx_accept:
 				IEEE80211_KEYIX_NONE : rs->rs_keyix);
 		sc->sc_lastrs = rs;
 		if (ni != NULL) {
+#if NOTYET
 		/* tag AMPDU aggregates for reorder processing */
+		/*
+		 * XXX this should only tag frames marked as aggregate; rather
+		 * XXX than all frames.
+		 */
 		if (ni->ni_flags & IEEE80211_NODE_HT)
 			m->m_flags |= M_AMPDU;
+#endif
 
 			/*
 			 * Sending station is known, dispatch directly.