aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-21 00:08:25 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-21 00:08:25 -0400
commitfd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (patch)
tree88f81d90021bd38b33622169103988f1e0a66510 /drivers
parent783c99f42e221217761e9c319838d5533107f7cb (diff)
parent54caf44da31995df1f51174468fd9e83ca5c67a2 (diff)
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/lp486e.c6
-rw-r--r--drivers/net/mv643xx_eth.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 69ff83101107..0258aaca9ed3 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -442,16 +442,16 @@ init_rx_bufs(struct net_device *dev, int num) {
442 if (rbd) { 442 if (rbd) {
443 rbd->pad = 0; 443 rbd->pad = 0;
444 rbd->count = 0; 444 rbd->count = 0;
445 rbd->skb = dev_alloc_skb(RX_SKB_SIZE); 445 rbd->skb = dev_alloc_skb(RX_SKBSIZE);
446 if (!rbd->skb) { 446 if (!rbd->skb) {
447 printk("dev_alloc_skb failed"); 447 printk("dev_alloc_skb failed");
448 } 448 }
449 rbd->next = rfd->rbd; 449 rbd->next = rfd->rbd;
450 if (i) { 450 if (i) {
451 rfd->rbd->prev = rbd; 451 rfd->rbd->prev = rbd;
452 rbd->size = RX_SKB_SIZE; 452 rbd->size = RX_SKBSIZE;
453 } else { 453 } else {
454 rbd->size = (RX_SKB_SIZE | RBD_EL); 454 rbd->size = (RX_SKBSIZE | RBD_EL);
455 lp->rbd_tail = rbd; 455 lp->rbd_tail = rbd;
456 } 456 }
457 457
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)
385 struct pkt_info pkt_info; 385 struct pkt_info pkt_info;
386 386
387 while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) { 387 while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
388 dma_unmap_single(NULL, pkt_info.buf_ptr, RX_SKB_SIZE, 388 dma_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
389 DMA_FROM_DEVICE); 389 DMA_FROM_DEVICE);
390 mp->rx_desc_count--; 390 mp->rx_desc_count--;
391 received_packets++; 391 received_packets++;