patch-2.3.99-pre7 linux/drivers/net/pcmcia/wavelan_cs.c

• Lines: 46
• Date: Thu May 4 11:24:42 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/pcmcia/wavelan_cs.c
• Orig date: Sun Feb 20 21:12:39 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/pcmcia/wavelan_cs.c linux/drivers/net/pcmcia/wavelan_cs.c
@@ -2926,7 +2926,7 @@
   lp->stats.tx_bytes += length;
 
   /* If watchdog not already active, activate it... */
-  if(lp->watchdog.prev == (timer_list *) NULL)
+  if (!timer_pending(&lp->watchdog))
     {
       /* set timer to expire in WATCHDOG_JIFFIES */
       lp->watchdog.expires = jiffies + WATCHDOG_JIFFIES;
@@ -3655,7 +3655,7 @@
 #endif
 
   /* If watchdog was activated, kill it ! */
-  if(lp->watchdog.prev != (timer_list *) NULL)
+  if (timer_pending(&lp->watchdog))
     del_timer(&lp->watchdog);
 
   lp->nresets++;
@@ -4061,7 +4061,7 @@
 #endif
 
 	  /* If watchdog was activated, kill it ! */
-	  if(lp->watchdog.prev != (timer_list *) NULL)
+	  if(timer_pending(&lp->watchdog))
 	    del_timer(&lp->watchdog);
 
 	  /* Get transmission status */
@@ -4353,7 +4353,7 @@
 #endif	/* WAVELAN_ROAMING */
 
   /* If watchdog was activated, kill it ! */
-  if(lp->watchdog.prev != (timer_list *) NULL)
+  if(timer_pending(&lp->watchdog))
     del_timer(&lp->watchdog);
 
   link->open--;
@@ -4498,8 +4498,7 @@
 #endif
 
   /* Other specific data */
-  /* Provide storage area for device name */
-  dev->name = ((net_local *)dev->priv)->node.dev_name;
+  strcpy(dev->name, ((net_local *)dev->priv)->node.dev_name);
   netif_start_queue (dev);
   dev->mtu = WAVELAN_MTU;