X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fnet%2Fa2065.c;h=6c5719ae8ccaac3fdaac37fe06fc0aa630c83c89;hb=7cc8f38188133e0c278b9f207d63c2c2b4d98236;hp=18f7f815f66e2166cf4d12af0927cc85a7ec6cd3;hpb=0795af5729b18218767fab27c44b1384f72dc9ad;p=safe%2Fjmp%2Flinux-2.6 diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c index 18f7f81..6c5719a 100644 --- a/drivers/net/a2065.c +++ b/drivers/net/a2065.c @@ -269,8 +269,6 @@ static int lance_rx (struct net_device *dev) volatile struct lance_regs *ll = lp->ll; volatile struct lance_rx_desc *rd; unsigned char bits; - int len = 0; /* XXX shut up gcc warnings */ - struct sk_buff *skb = 0; /* XXX shut up gcc warnings */ #ifdef TEST_HITS int i; @@ -306,10 +304,10 @@ static int lance_rx (struct net_device *dev) if (bits & LE_R1_FRA) dev->stats.rx_frame_errors++; if (bits & LE_R1_EOP) dev->stats.rx_errors++; } else { - len = (rd->mblength & 0xfff) - 4; - skb = dev_alloc_skb (len+2); + int len = (rd->mblength & 0xfff) - 4; + struct sk_buff *skb = dev_alloc_skb (len+2); - if (skb == 0) { + if (!skb) { printk(KERN_WARNING "%s: Memory squeeze, " "deferring packet.\n", dev->name); dev->stats.rx_dropped++; @@ -477,7 +475,7 @@ static irqreturn_t lance_interrupt (int irq, void *dev_id) return IRQ_HANDLED; } -struct net_device *last_dev = 0; +struct net_device *last_dev; static int lance_open (struct net_device *dev) {