summaryrefslogtreecommitdiff
path: root/drivers/net/mv643xx_eth.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-21 08:08:25 +0400
committerJeff Garzik <jeff@garzik.org>2006-09-21 08:08:25 +0400
commitfd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (patch)
tree88f81d90021bd38b33622169103988f1e0a66510 /drivers/net/mv643xx_eth.c
parent783c99f42e221217761e9c319838d5533107f7cb (diff)
parent54caf44da31995df1f51174468fd9e83ca5c67a2 (diff)
downloadlinux-fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b.tar.xz
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
-rw-r--r--drivers/net/mv643xx_eth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 0917a767faf8..6a74608eb9a3 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -385,7 +385,7 @@ 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_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
DMA_FROM_DEVICE);
mp->rx_desc_count--;
received_packets++;