diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/net/lp486e.c | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
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) { | |||
| 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 | ||