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

• Lines: 19
• Date: Fri May 5 12:37:52 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/pcmcia/netwave_cs.c
• Orig date: Sun Feb 20 21:12:39 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/pcmcia/netwave_cs.c linux/drivers/net/pcmcia/netwave_cs.c
@@ -502,7 +502,7 @@
     dev->do_ioctl = &netwave_ioctl;
 
     ether_setup(dev);
-    dev->name = priv->node.dev_name;
+    strcpy(dev->name, priv->node.dev_name);
     dev->init = &netwave_init;
     dev->open = &netwave_open;
     dev->stop = &netwave_close;
@@ -1224,8 +1224,7 @@
     writeb(NETWAVE_CMD_EOC, ramBase + NETWAVE_EREG_CB + 3);
 	
     /* If watchdog not already active, activate it... */
-    if(priv->watchdog.prev == (struct timer_list *) NULL) {
-
+    if (!timer_pending(&priv->watchdog)) {
 	/* set timer to expire in WATCHDOG_JIFFIES */
 	priv->watchdog.expires = jiffies + WATCHDOG_JIFFIES;
 	add_timer(&priv->watchdog);