diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 5 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 56a0ac4ddc62..964fb971fd6a 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -100,6 +100,11 @@ enum buffer_type { | |||
100 | 100 | ||
101 | #define ATH_TXSTATUS_RING_SIZE 64 | 101 | #define ATH_TXSTATUS_RING_SIZE 64 |
102 | 102 | ||
103 | #define DS2PHYS(_dd, _ds) \ | ||
104 | ((_dd)->dd_desc_paddr + ((caddr_t)(_ds) - (caddr_t)(_dd)->dd_desc)) | ||
105 | #define ATH_DESC_4KB_BOUND_CHECK(_daddr) ((((_daddr) & 0xFFF) > 0xF7F) ? 1 : 0) | ||
106 | #define ATH_DESC_4KB_BOUND_NUM_SKIPPED(_len) ((_len) / 4096) | ||
107 | |||
103 | struct ath_descdma { | 108 | struct ath_descdma { |
104 | void *dd_desc; | 109 | void *dd_desc; |
105 | dma_addr_t dd_desc_paddr; | 110 | dma_addr_t dd_desc_paddr; |
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 50103b2792b5..ce297173e0d3 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
@@ -298,10 +298,6 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd, | |||
298 | struct list_head *head, const char *name, | 298 | struct list_head *head, const char *name, |
299 | int nbuf, int ndesc, bool is_tx) | 299 | int nbuf, int ndesc, bool is_tx) |
300 | { | 300 | { |
301 | #define DS2PHYS(_dd, _ds) \ | ||
302 | ((_dd)->dd_desc_paddr + ((caddr_t)(_ds) - (caddr_t)(_dd)->dd_desc)) | ||
303 | #define ATH_DESC_4KB_BOUND_CHECK(_daddr) ((((_daddr) & 0xFFF) > 0xF7F) ? 1 : 0) | ||
304 | #define ATH_DESC_4KB_BOUND_NUM_SKIPPED(_len) ((_len) / 4096) | ||
305 | struct ath_common *common = ath9k_hw_common(sc->sc_ah); | 301 | struct ath_common *common = ath9k_hw_common(sc->sc_ah); |
306 | u8 *ds; | 302 | u8 *ds; |
307 | struct ath_buf *bf; | 303 | struct ath_buf *bf; |
@@ -396,9 +392,6 @@ fail2: | |||
396 | fail: | 392 | fail: |
397 | memset(dd, 0, sizeof(*dd)); | 393 | memset(dd, 0, sizeof(*dd)); |
398 | return error; | 394 | return error; |
399 | #undef ATH_DESC_4KB_BOUND_CHECK | ||
400 | #undef ATH_DESC_4KB_BOUND_NUM_SKIPPED | ||
401 | #undef DS2PHYS | ||
402 | } | 395 | } |
403 | 396 | ||
404 | void ath9k_init_crypto(struct ath_softc *sc) | 397 | void ath9k_init_crypto(struct ath_softc *sc) |