diff options
| author | Linus Torvalds | 2006-09-22 15:37:31 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2006-09-22 15:37:31 -0700 |
| commit | 3e2ab46df697048e222cdc046a2fa97149ca32ba (patch) | |
| tree | f0b53afc6054853f7281b833d2d6b9ed48ed2b19 /drivers/net/lp486e.c | |
| parent | e6e5fee1426bef07f4e6c3c76f48343c14207938 (diff) | |
| parent | 54caf44da31995df1f51174468fd9e83ca5c67a2 (diff) | |
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/lp486e.c')
| -rw-r--r-- | drivers/net/lp486e.c | 6 |
1 files changed, 3 insertions, 3 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; } |