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

[Bernhard Schmidt]

Author: bschmidt
Date: Sun Apr 15 18:25:17 2012
New Revision: 234321
URL: http://svn.freebsd.org/changeset/base/234321

Log:
  Use the M_AMPDU_MPDU flag to determine when to manually set the seqno and
  use a BA queue.

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

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Sun Apr 15 17:28:47 2012	(r234320)
+++ head/sys/dev/iwn/if_iwn.c	Sun Apr 15 18:25:17 2012	(r234321)
@@ -3308,18 +3308,15 @@ iwn_tx_data(struct iwn_softc *sc, struct
 		tid = 0;
 	}
 	ac = M_WME_GETAC(m);
-
-	if (IEEE80211_QOS_HAS_SEQ(wh) &&
-	    IEEE80211_AMPDU_RUNNING(&ni->ni_tx_ampdu[ac])) {
+	if (m->m_flags & M_AMPDU_MPDU) {
 		struct ieee80211_tx_ampdu *tap = &ni->ni_tx_ampdu[ac];
 
-		ring = &sc->txq[*(int *)tap->txa_private];
+		ac = *(int *)tap->txa_private;
 		*(uint16_t *)wh->i_seq =
 		    htole16(ni->ni_txseqs[tid] << IEEE80211_SEQ_SEQ_SHIFT);
 		ni->ni_txseqs[tid]++;
-	} else {
-		ring = &sc->txq[ac];
 	}
+	ring = &sc->txq[ac];
 	desc = &ring->desc[ring->cur];
 	data = &ring->data[ring->cur];