asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] mv643xx_eth: Fix dma_map/dma_unmap relations

Browse source 
If you do a dma_map_single you must do dma_unmap_single and if you do
a dma_map_page you must do a dma_unmap_page.

Signed-off-by: Paolo Galtieri <pgaltieri@mvista.com>
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>

 mv643xx_eth.c |   51 +++++++++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 30 deletions(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Paolo Galtieri 2006-01-16 16:48:02 -07:00 committed by Jeff Garzik
parent 78a5e53475
commit cb415d3004
1 changed files with 20 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
drivers/net/mv643xx_eth.c
View file

@ -353,27 +353,19 @@ static int mv643xx_eth_free_tx_queue(struct net_device *dev,
stats->tx_errors++; stats->tx_errors++;
} }
/* if (pkt_info.cmd_sts & ETH_TX_FIRST_DESC)
* If return_info is different than 0, release the skb. dma_unmap_single(NULL, pkt_info.buf_ptr,
* The case where return_info is not 0 is only in case pkt_info.byte_cnt,
* when transmitted a scatter/gather packet, where only DMA_TO_DEVICE);
* last skb releases the whole chain. else
*/ dma_unmap_page(NULL, pkt_info.buf_ptr,
if (pkt_info.return_info) { pkt_info.byte_cnt,
if (skb_shinfo(pkt_info.return_info)->nr_frags) DMA_TO_DEVICE);
dma_unmap_page(NULL, pkt_info.buf_ptr,
pkt_info.byte_cnt,
DMA_TO_DEVICE);
else
dma_unmap_single(NULL, pkt_info.buf_ptr,
pkt_info.byte_cnt,
DMA_TO_DEVICE);
if (pkt_info.return_info) {
dev_kfree_skb_irq(pkt_info.return_info); dev_kfree_skb_irq(pkt_info.return_info);
released = 0; released = 0;
} else }
dma_unmap_page(NULL, pkt_info.buf_ptr,
pkt_info.byte_cnt, DMA_TO_DEVICE);
} }
spin_unlock(&mp->lock); spin_unlock(&mp->lock);
@ -1024,20 +1016,17 @@ static void mv643xx_tx(struct net_device *dev)
struct pkt_info pkt_info; struct pkt_info pkt_info;
while (eth_tx_return_desc(mp, &pkt_info) == ETH_OK) { while (eth_tx_return_desc(mp, &pkt_info) == ETH_OK) {
if (pkt_info.return_info) { if (pkt_info.cmd_sts & ETH_TX_FIRST_DESC)
if (skb_shinfo(pkt_info.return_info)->nr_frags) dma_unmap_single(NULL, pkt_info.buf_ptr,
dma_unmap_page(NULL, pkt_info.buf_ptr, pkt_info.byte_cnt,
pkt_info.byte_cnt, DMA_TO_DEVICE);
DMA_TO_DEVICE); else
else
dma_unmap_single(NULL, pkt_info.buf_ptr,
pkt_info.byte_cnt,
DMA_TO_DEVICE);
dev_kfree_skb_irq(pkt_info.return_info);
} else
dma_unmap_page(NULL, pkt_info.buf_ptr, dma_unmap_page(NULL, pkt_info.buf_ptr,
pkt_info.byte_cnt, DMA_TO_DEVICE); pkt_info.byte_cnt,
DMA_TO_DEVICE);
if (pkt_info.return_info)
dev_kfree_skb_irq(pkt_info.return_info);
} }
if (netif_queue_stopped(dev) && if (netif_queue_stopped(dev) &&