summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2013-03-19 17:54:37 +0000
committeradrian <adrian@FreeBSD.org>2013-03-19 17:54:37 +0000
commit83430af28239ffb8229aa2dcda281c78d1307126 (patch)
treeeaa761c275fadf7494dac6c93167647a68c3870d /sys/dev
parentd668ffd12451cb7d331f085834c5c4e9ecee7a15 (diff)
downloadFreeBSD-src-83430af28239ffb8229aa2dcda281c78d1307126.zip
FreeBSD-src-83430af28239ffb8229aa2dcda281c78d1307126.tar.gz
Now that the tx map field is correctly populated for both edma and
legacy chips, just use that.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ath/if_ath_tx.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c
index c7b0fc1..092cecd 100644
--- a/sys/dev/ath/if_ath_tx.c
+++ b/sys/dev/ath/if_ath_tx.c
@@ -384,14 +384,11 @@ ath_tx_chaindesclist(struct ath_softc *sc, struct ath_desc *ds0,
*/
/*
- * 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
OpenPOWER on IntegriCloud