aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/a2065.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/a2065.c')
-rw-r--r--drivers/net/a2065.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 18f7f815f66e..6c5719ae8cca 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -269,8 +269,6 @@ static int lance_rx (struct net_device *dev)
269 volatile struct lance_regs *ll = lp->ll; 269 volatile struct lance_regs *ll = lp->ll;
270 volatile struct lance_rx_desc *rd; 270 volatile struct lance_rx_desc *rd;
271 unsigned char bits; 271 unsigned char bits;
272 int len = 0; /* XXX shut up gcc warnings */
273 struct sk_buff *skb = 0; /* XXX shut up gcc warnings */
274 272
275#ifdef TEST_HITS 273#ifdef TEST_HITS
276 int i; 274 int i;
@@ -306,10 +304,10 @@ static int lance_rx (struct net_device *dev)
306 if (bits & LE_R1_FRA) dev->stats.rx_frame_errors++; 304 if (bits & LE_R1_FRA) dev->stats.rx_frame_errors++;
307 if (bits & LE_R1_EOP) dev->stats.rx_errors++; 305 if (bits & LE_R1_EOP) dev->stats.rx_errors++;
308 } else { 306 } else {
309 len = (rd->mblength & 0xfff) - 4; 307 int len = (rd->mblength & 0xfff) - 4;
310 skb = dev_alloc_skb (len+2); 308 struct sk_buff *skb = dev_alloc_skb (len+2);
311 309
312 if (skb == 0) { 310 if (!skb) {
313 printk(KERN_WARNING "%s: Memory squeeze, " 311 printk(KERN_WARNING "%s: Memory squeeze, "
314 "deferring packet.\n", dev->name); 312 "deferring packet.\n", dev->name);
315 dev->stats.rx_dropped++; 313 dev->stats.rx_dropped++;
@@ -477,7 +475,7 @@ static irqreturn_t lance_interrupt (int irq, void *dev_id)
477 return IRQ_HANDLED; 475 return IRQ_HANDLED;
478} 476}
479 477
480struct net_device *last_dev = 0; 478struct net_device *last_dev;
481 479
482static int lance_open (struct net_device *dev) 480static int lance_open (struct net_device *dev)
483{ 481{