svn commit: r222680 - head/sys/dev/iwn

[Bernhard Schmidt]

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];