diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-26 23:48:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-26 23:48:40 -0800 |
| commit | 5b9ab2ec04ec1e1e53939768805612ac191d7ba2 (patch) | |
| tree | 22d29905c148d2d743b3eccb585fbe60fb91e25a /drivers/net/wireless/iwlwifi | |
| parent | 851fd7bd88524bb4e20f3def3127cd9167d6d0cf (diff) | |
| parent | 3ec192559033ed457f0d7856838654c100fc659f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/hp-plus.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath9k/recv.c
net/wireless/reg.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index c8ce84a1eef..7888250117d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -1228,9 +1228,11 @@ void iwl_rx_handle(struct iwl_priv *priv) rxq->queue[i] = NULL; - pci_dma_sync_single_for_cpu(priv->pci_dev, rxb->aligned_dma_addr, - priv->hw_params.rx_buf_size, - PCI_DMA_FROMDEVICE); + dma_sync_single_range_for_cpu( + &priv->pci_dev->dev, rxb->real_dma_addr, + rxb->aligned_dma_addr - rxb->real_dma_addr, + priv->hw_params.rx_buf_size, + PCI_DMA_FROMDEVICE); pkt = (struct iwl_rx_packet *)rxb->skb->data; /* Reclaim a command buffer only if this packet is a response |