summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbschmidt <bschmidt@FreeBSD.org>2011-04-16 09:39:08 +0000
committerbschmidt <bschmidt@FreeBSD.org>2011-04-16 09:39:08 +0000
commit021ca1d5e8c2837f4accb324675486959e007579 (patch)
tree927db8a7810b552e33c60cf78deafccd77df918b
parentaa270ec74701a3ba01ba11ce9a7c1b0b1d34d0aa (diff)
downloadFreeBSD-src-021ca1d5e8c2837f4accb324675486959e007579.zip
FreeBSD-src-021ca1d5e8c2837f4accb324675486959e007579.tar.gz
scratch_paddr has the same address pre-assigned, use that instead.
-rw-r--r--sys/dev/iwn/if_iwn.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c
index 384d1ca..6d62f3a 100644
--- a/sys/dev/iwn/if_iwn.c
+++ b/sys/dev/iwn/if_iwn.c
@@ -3145,7 +3145,6 @@ iwn_tx_data_raw(struct iwn_softc *sc, struct mbuf *m,
struct iwn_tx_desc *desc;
struct iwn_tx_data *data;
struct mbuf *mnew;
- bus_addr_t paddr;
bus_dma_segment_t segs[IWN_MAX_SCATTER];
uint32_t flags;
u_int hdrlen;
@@ -3246,9 +3245,8 @@ iwn_tx_data_raw(struct iwn_softc *sc, struct mbuf *m,
txant = IWN_LSB(sc->txchainmask);
tx->rflags |= IWN_RFLAG_ANT(txant);
/* Set physical address of "scratch area". */
- paddr = ring->cmd_dma.paddr + ring->cur * sizeof (struct iwn_tx_cmd);
- tx->loaddr = htole32(IWN_LOADDR(paddr));
- tx->hiaddr = IWN_HIADDR(paddr);
+ tx->loaddr = htole32(IWN_LOADDR(data->scratch_paddr));
+ tx->hiaddr = IWN_HIADDR(data->scratch_paddr);
/* Copy 802.11 header in TX command. */
memcpy((uint8_t *)(tx + 1), wh, hdrlen);
OpenPOWER on IntegriCloud