From owner-svn-src-all@FreeBSD.ORG  Sat Jun  4 11:56:20 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 DF9CC106566B;
	Sat,  4 Jun 2011 11:56:20 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CFD738FC0A;
	Sat,  4 Jun 2011 11:56:20 +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 p54BuK67009086;
	Sat, 4 Jun 2011 11:56:20 GMT (envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p54BuKJl009084;
	Sat, 4 Jun 2011 11:56:20 GMT (envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201106041156.p54BuKJl009084@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sat, 4 Jun 2011 11:56:20 +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: r222680 - head/sys/dev/iwn
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: Sat, 04 Jun 2011 11:56:21 -0000

Author: bschmidt
Date: Sat Jun  4 11:56:20 2011
New Revision: 222680
URL: http://svn.freebsd.org/changeset/base/222680

Log:
  Only consider QoS frames for TX packet aggregation.

Modified:
  head/sys/dev/iwn/if_iwn.c

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Sat Jun  4 11:43:09 2011	(r222679)
+++ head/sys/dev/iwn/if_iwn.c	Sat Jun  4 11:56:20 2011	(r222680)
@@ -3314,7 +3314,8 @@ iwn_tx_data(struct iwn_softc *sc, struct
 	}
 	ac = M_WME_GETAC(m);
 
-	if (IEEE80211_AMPDU_RUNNING(&ni->ni_tx_ampdu[ac])) {
+	if (IEEE80211_QOS_HAS_SEQ(wh) &&
+	    IEEE80211_AMPDU_RUNNING(&ni->ni_tx_ampdu[ac])) {
 		struct ieee80211_tx_ampdu *tap = &ni->ni_tx_ampdu[ac];
 
 		ring = &sc->txq[*(int *)tap->txa_private];