diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-21 00:08:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-21 00:08:25 -0400 |
| commit | fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (patch) | |
| tree | 88f81d90021bd38b33622169103988f1e0a66510 | |
| parent | 783c99f42e221217761e9c319838d5533107f7cb (diff) | |
| parent | 54caf44da31995df1f51174468fd9e83ca5c67a2 (diff) | |
| download | linux-3.10-fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b.tar.gz linux-3.10-fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b.tar.bz2 linux-3.10-fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b.zip | |
Merge branch 'upstream-fixes' into upstream
| -rw-r--r-- | drivers/net/lp486e.c | 6 | ||||
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c index 69ff8310110..0258aaca9ed 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/lp486e.c @@ -442,16 +442,16 @@ init_rx_bufs(struct net_device *dev, int num) { if (rbd) { rbd->pad = 0; rbd->count = 0; - rbd->skb = dev_alloc_skb(RX_SKB_SIZE); + rbd->skb = dev_alloc_skb(RX_SKBSIZE); if (!rbd->skb) { printk("dev_alloc_skb failed"); } rbd->next = rfd->rbd; if (i) { rfd->rbd->prev = rbd; - rbd->size = RX_SKB_SIZE; + rbd->size = RX_SKBSIZE; } else { - rbd->size = (RX_SKB_SIZE | RBD_EL); + rbd->size = (RX_SKBSIZE | RBD_EL); lp->rbd_tail = rbd; } diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 0917a767faf..6a74608eb9a 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++; |