diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 15:37:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 15:37:31 -0700 |
| commit | 3e2ab46df697048e222cdc046a2fa97149ca32ba (patch) | |
| tree | f0b53afc6054853f7281b833d2d6b9ed48ed2b19 /drivers/net | |
| parent | e6e5fee1426bef07f4e6c3c76f48343c14207938 (diff) | |
| parent | 54caf44da31995df1f51174468fd9e83ca5c67a2 (diff) | |
| download | talos-obmc-linux-3e2ab46df697048e222cdc046a2fa97149ca32ba.tar.gz talos-obmc-linux-3e2ab46df697048e222cdc046a2fa97149ca32ba.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
[netdrvr] mv643xx_eth: fix obvious typo, which caused build breakage
[netdrvr] lp486e: fix typo
Diffstat (limited to 'drivers/net')
| -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 b783a6984abc..393aba95cf12 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 eeab1df5bef3..59de3e74d2d7 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++; |
