From owner-svn-src-all@FreeBSD.ORG  Tue Mar 22 13:20:11 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 88CC4106566B;
	Tue, 22 Mar 2011 13:20:11 +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 776E68FC13;
	Tue, 22 Mar 2011 13:20:11 +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 p2MDKBR7060725;
	Tue, 22 Mar 2011 13:20:11 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2MDKB3T060723;
	Tue, 22 Mar 2011 13:20:11 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201103221320.p2MDKB3T060723@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 22 Mar 2011 13:20:11 +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: r219868 - 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: Tue, 22 Mar 2011 13:20:11 -0000

Author: adrian
Date: Tue Mar 22 13:20:11 2011
New Revision: 219868
URL: http://svn.freebsd.org/changeset/base/219868

Log:
  This isn't actually needed any longer, A-MPDU frames work fine if only tagged for 11n nodes.

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

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Tue Mar 22 13:19:29 2011	(r219867)
+++ head/sys/dev/ath/if_ath.c	Tue Mar 22 13:20:11 2011	(r219868)
@@ -3531,15 +3531,6 @@ rx_accept:
 			rs->rs_keyix == HAL_RXKEYIX_INVALID ?
 				IEEE80211_KEYIX_NONE : rs->rs_keyix);
 		sc->sc_lastrs = rs;
-		/* tag AMPDU aggregates for reorder processing */
-#if 0
-		/*
-		 * Just make sure all frames are tagged for AMPDU reorder checking.
-		 * As there seems to be some situations where single frames aren't
-		 * matching a node but bump the seqno. This needs to be investigated.
-		 */
-		m->m_flags |= M_AMPDU;
-#endif
 
 		/* Keep statistics on the number of aggregate packets received */
 		if (rs->rs_isaggr)