From 8ec42b53030377f3dddd6f3139057e47817ada69 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 22 Sep 2006 15:47:06 -0700 Subject: [PATCH] --- yaml --- r: 34345 b: refs/heads/master c: db392219c5f572610645696e3672f6ea38783a65 h: refs/heads/master i: 34343: 24524c00e448d7e7dbe5019028f301b941218b27 v: v3 --- [refs] | 2 +- trunk/drivers/net/lp486e.c | 6 +++--- trunk/drivers/net/mv643xx_eth.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c21530a23519..04a3962d43ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cd330d36b32ed48d49561b165842db20bd153cc +refs/heads/master: db392219c5f572610645696e3672f6ea38783a65 diff --git a/trunk/drivers/net/lp486e.c b/trunk/drivers/net/lp486e.c index b783a6984abc..393aba95cf12 100644 --- a/trunk/drivers/net/lp486e.c +++ b/trunk/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/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c index eeab1df5bef3..59de3e74d2d7 100644 --- a/trunk/drivers/net/mv643xx_eth.c +++ b/trunk/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++;