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

[Adrian Chadd]

Author: adrian
Date: Tue Mar 19 17:54:37 2013
New Revision: 248527
URL: http://svnweb.freebsd.org/changeset/base/248527

Log:
  Now that the tx map field is correctly populated for both edma and
  legacy chips, just use that.

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	Tue Mar 19 17:13:47 2013	(r248526)
+++ head/sys/dev/ath/if_ath_tx.c	Tue Mar 19 17:54:37 2013	(r248527)
@@ -384,14 +384,11 @@ ath_tx_chaindesclist(struct ath_softc *s
 	 */
 
 	/*
-	 * For now the HAL doesn't implement halNumTxMaps for non-EDMA
-	 * (ie it's 0.)  So just work around it.
-	 *
-	 * XXX TODO: populate halNumTxMaps for each HAL chip and
-	 * then undo this hack.
+	 * We need the number of TX data pointers in each descriptor.
+	 * EDMA and later chips support 4 TX buffers per descriptor;
+	 * previous chips just support one.
 	 */
-	if (sc->sc_ah->ah_magic == 0x19741014)
-		numTxMaps = 4;
+	numTxMaps = sc->sc_tx_nmaps;
 
 	/*
 	 * For EDMA and later chips ensure the TX map is fully populated