Merge branch 'upstream-fixes' into upstream

38ed61d6 · Jeff Garzik · 42911305 · 71d28725 · 38ed61d6
Commit 38ed61d6 authored Sep 13, 2006 by Jeff Garzik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

drivers/net/mv643xx_eth.c drivers/net/mv643xx_eth.c +2 -0

No files found.
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -385,6 +385,8 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
 	struct pkt_info pkt_info;

 	while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
+		dma_unmap_single(NULL, pkt_info.buf_ptr, RX_SKB_SIZE,
+							DMA_FROM_DEVICE);
 		mp->rx_desc_count--;
 		received_packets++;