Merge branch 'upstream-fixes' into upstream

git-mirror · Sep 13, 2006 · 38ed61d · 38ed61d
2 parents 4291130 + 71d2872
commit 38ed61d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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++;