summaryrefslogtreecommitdiffstats
path: root/drivers/net/lp486e.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-21 00:08:25 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-21 00:08:25 -0400
commitfd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (patch)
tree88f81d90021bd38b33622169103988f1e0a66510 /drivers/net/lp486e.c
parent783c99f42e221217761e9c319838d5533107f7cb (diff)
parent54caf44da31995df1f51174468fd9e83ca5c67a2 (diff)
downloadblackbird-op-linux-fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b.tar.gz
blackbird-op-linux-fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b.zip
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/lp486e.c')
-rw-r--r--drivers/net/lp486e.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 69ff83101107..0258aaca9ed3 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;
}
OpenPOWER on IntegriCloud