svn commit: r236874 - head/sys/dev/ath

[Adrian Chadd]

Author: adrian
Date: Mon Jun 11 07:08:40 2012
New Revision: 236874
URL: http://svn.freebsd.org/changeset/base/236874

Log:
  Finish undoing the previous commit - this part of the code is no longer
  required.
  
  PR:		kern/166190

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

Modified: head/sys/dev/ath/if_ath_tx.c
==============================================================================
--- head/sys/dev/ath/if_ath_tx.c	Mon Jun 11 07:06:49 2012	(r236873)
+++ head/sys/dev/ath/if_ath_tx.c	Mon Jun 11 07:08:40 2012	(r236874)
@@ -1518,18 +1518,15 @@ ath_tx_start(struct ath_softc *sc, struc
 		 * TID and thus mess with the BAW.
 		 */
 		seqno = ath_tx_tid_seqno_assign(sc, ni, bf, m0);
+
+		/*
+		 * Don't add QoS NULL frames to the BAW.
+		 */
 		if (IEEE80211_QOS_HAS_SEQ(wh) &&
 		    subtype != IEEE80211_FC0_SUBTYPE_QOS_NULL) {
 			bf->bf_state.bfs_dobaw = 1;
 		}
 		ATH_TXQ_UNLOCK(txq);
-	} else {
-		/* No AMPDU TX, we've been assigned a sequence number. */
-		if (IEEE80211_QOS_HAS_SEQ(wh)) {
-			/* XXX we should store the frag+seqno in bfs_seqno */
-			bf->bf_state.bfs_seqno =
-			    M_SEQNO_GET(m0) << IEEE80211_SEQ_SEQ_SHIFT;
-		}
 	}
 
 	/*