patch-2.3.99-pre7 linux/drivers/net/wan/cycx_x25.c

• Lines: 23
• Date: Thu May 4 11:31:21 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/wan/cycx_x25.c
• Orig date: Tue Apr 11 15:09:18 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/wan/cycx_x25.c linux/drivers/net/wan/cycx_x25.c
@@ -422,7 +422,7 @@
 	}
 
 	/* prepare network device data space for registration */
-	dev->name = chan->name;
+	strcpy(dev->name, chan->name);
 	dev->init = if_init;
 	dev->priv = chan;
 
@@ -1513,11 +1513,8 @@
 {
 	x25_channel_t *chan = dev->priv;
 
-	if (chan->svc) {
-		del_timer(&chan->timer);
-		chan->timer.expires = jiffies + chan->idle_tmout * HZ;
-		add_timer(&chan->timer);
-	}
+	if (chan->svc)
+		mod_timer(&chan->timer, jiffies+chan->idle_tmout*HZ);
 }
 #ifdef CYCLOMX_X25_DEBUG
 static void x25_dump_config(TX25Config *conf)