summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/rt2x00/rt2x00pci.h
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-02-17 17:33:24 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:37:22 -0500
commit30b3a23c2594e122e7086f97b5252a87eaf8a817 (patch)
tree6c97b928fce785471236543fe71bce3b6d0324cb /drivers/net/wireless/rt2x00/rt2x00pci.h
parente542239f639fa4e7b13a949d39d44ff1eccf7e3a (diff)
downloadlinux-3.10-30b3a23c2594e122e7086f97b5252a87eaf8a817.tar.gz
linux-3.10-30b3a23c2594e122e7086f97b5252a87eaf8a817.tar.bz2
linux-3.10-30b3a23c2594e122e7086f97b5252a87eaf8a817.zip
rt2x00: Fix Descriptor DMA initialization
As Adam Baker reported the DMA address for the descriptor base was incorrectly initialized in the PCI drivers. Instead of the DMA base for the descriptor, the DMA base for the data was passed resulting in a broken TX/RX state for PCI drivers. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00pci.h')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00pci.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h
index 8932b31d262..9d1cdb99431 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.h
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.h
@@ -103,9 +103,10 @@ int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev,
*/
struct queue_entry_priv_pci_rx {
__le32 *desc;
+ dma_addr_t desc_dma;
void *data;
- dma_addr_t dma;
+ dma_addr_t data_dma;
};
/**
@@ -118,9 +119,10 @@ struct queue_entry_priv_pci_rx {
*/
struct queue_entry_priv_pci_tx {
__le32 *desc;
+ dma_addr_t desc_dma;
void *data;
- dma_addr_t dma;
+ dma_addr_t data_dma;
struct ieee80211_tx_control control;
};