summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2012-08-19 02:16:22 +0000
committeradrian <adrian@FreeBSD.org>2012-08-19 02:16:22 +0000
commit5ab9e66230765126176960b49c6b6480f976ef43 (patch)
tree825d50e546611cbe71e6476be93056a6377eeba4
parentcaa9902fff4e1a2aa79fe76139984b98ddbf4360 (diff)
downloadFreeBSD-src-5ab9e66230765126176960b49c6b6480f976ef43.zip
FreeBSD-src-5ab9e66230765126176960b49c6b6480f976ef43.tar.gz
When assembling the descriptor list, make sure that the "first" descriptor
is marked correctly. The existing logic assumed that the first descriptor is i == 0, which doesn't hold for EDMA TX. In this instance, the first time filltxdesc() is called can be up to i == 3. So for a two-buffer descriptor: * firstSeg is set to 0; * lastSeg is set to 1; * the ath_hal_filltxdesc() code will treat it as the last segment in a descriptor chain and blank some of the descriptor fields, causing the TX to stop. When firstSeg is set to 1 (regardless of lastSeg), it overrides the lastSeg setting. Thus, ath_hal_filltxdesc() won't blank out these fields. Tested: AR9380, STA mode. With this, association is successful.
-rw-r--r--sys/dev/ath/if_ath_tx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c
index 6433307..f5a3bcc 100644
--- a/sys/dev/ath/if_ath_tx.c
+++ b/sys/dev/ath/if_ath_tx.c
@@ -306,6 +306,7 @@ ath_tx_chaindesclist(struct ath_softc *sc, struct ath_buf *bf)
HAL_DMA_ADDR bufAddrList[4];
uint32_t segLenList[4];
int numTxMaps = 1;
+ int isFirstDesc = 1;
/*
* XXX There's txdma and txdma_mgmt; the descriptor
@@ -369,10 +370,11 @@ ath_tx_chaindesclist(struct ath_softc *sc, struct ath_buf *bf)
, segLenList
, bf->bf_descid /* XXX desc id */
, bf->bf_state.bfs_txq->axq_qnum /* XXX multicast? */
- , i == 0 /* first segment */
+ , isFirstDesc /* first segment */
, i == bf->bf_nseg - 1 /* last segment */
, ds0 /* first descriptor */
);
+ isFirstDesc = 0;
DPRINTF(sc, ATH_DEBUG_XMIT,
"%s: %d: %08x %08x %08x %08x %08x %08x\n",
__func__, i, ds->ds_link, ds->ds_data,
OpenPOWER on IntegriCloud