summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-13 20:26:12 +0400
committerJeff Garzik <jeff@garzik.org>2006-09-13 20:26:12 +0400
commit38ed61d6c0b2c35fbaa1ccdb497543a18509d401 (patch)
treed7be64b244119ccfb346d3cea7124bbc2135603e /drivers/net
parent4291130595065aa3c9fbb9130231f65e4914629a (diff)
parent71d28725548be203e8b8f6ad63b1f64fd7f02d4d (diff)
downloadlinux-38ed61d6c0b2c35fbaa1ccdb497543a18509d401.tar.xz
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/mv643xx_eth.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 760c61b98867..eeab1df5bef3 100644
--- 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++;