X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2F7990.c;h=750a46f4bc582beb5e8ca0762790127c3e0f09fe;hb=e1c25dc638db01600069b3f9167d1b35f8d574b5;hp=224e0bff1ae085ab777e1699e80fbd982bd7601a;hpb=038a5008b2f395c85e6e71d6ddf3c684e7c405b0;p=linux-2.6 diff --git a/drivers/net/7990.c b/drivers/net/7990.c index 224e0bff1a..750a46f4bc 100644 --- a/drivers/net/7990.c +++ b/drivers/net/7990.c @@ -277,8 +277,6 @@ static int lance_rx (struct net_device *dev) volatile struct lance_init_block *ib = lp->init_block; 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; #endif @@ -318,10 +316,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 ("%s: Memory squeeze, deferring packet.\n", dev->name); dev->stats.rx_dropped++;