Re: pull request: wireless-2.6 2008-11-18

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Johannes Berg
Date: Tuesday, November 18, 2008 - 6:33 pm

> and a final one fixes some mysterious DMA alignment problems



heh.


So Luis pointed out a bug in that, it might be useful to squish in this
patch: http://marc.info/?l=linux-wireless&m=122705425425763&w=2

(also below for reference)

But we can also just add it on top, whichever way you prefer.

johannes
---
 drivers/net/wireless/iwlwifi/iwl-agn.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- everything.orig/drivers/net/wireless/iwlwifi/iwl-agn.c	2008-11-19 01:16:12.000000000 +0100
+++ everything/drivers/net/wireless/iwlwifi/iwl-agn.c	2008-11-19 01:19:13.000000000 +0100
@@ -1229,9 +1229,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


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
pull request: wireless-2.6 2008-11-18, John W. Linville, (Tue Nov 18, 5:07 pm)
Re: pull request: wireless-2.6 2008-11-18, Johannes Berg, (Tue Nov 18, 6:33 pm)
Re: pull request: wireless-2.6 2008-11-18, John W. Linville, (Tue Nov 18, 6:54 pm)
Re: pull request: wireless-2.6 2008-11-18, Tomas Winkler, (Tue Nov 18, 11:46 pm)
Re: pull request: wireless-2.6 2008-11-18, Tomas Winkler, (Wed Nov 19, 2:34 am)
Re: pull request: wireless-2.6 2008-11-18, John W. Linville, (Wed Nov 19, 7:39 am)
Re: pull request: wireless-2.6 2008-11-18, Tomas Winkler, (Wed Nov 19, 9:51 am)
Re: pull request: wireless-2.6 2008-11-18, John W. Linville, (Wed Nov 19, 11:53 am)
Re: pull request: wireless-2.6 2008-11-18, Tomas Winkler, (Wed Nov 19, 2:55 pm)
Re: pull request: wireless-2.6 2008-11-18, John W. Linville, (Wed Nov 19, 5:37 pm)
Re: pull request: wireless-2.6 2008-11-18, Tomas Winkler, (Thu Nov 20, 2:27 am)
Re: pull request: wireless-2.6 2008-11-18, David Miller, (Thu Nov 20, 5:05 am)
Re: pull request: wireless-2.6 2008-11-18, Zhu Yi, (Sun Nov 23, 8:34 pm)
Re: pull request: wireless-2.6 2008-11-18, Marcel Holtmann, (Sun Nov 23, 8:50 pm)
Re: pull request: wireless-2.6 2008-11-18, Zhu Yi, (Sun Nov 23, 11:33 pm)
Re: pull request: wireless-2.6 2008-11-18, Marcel Holtmann, (Mon Nov 24, 1:33 am)