patch-2.3.99-pre6 linux/drivers/net/tulip/timer.c

• Lines: 35
• Date: Fri Apr 14 10:09:00 2000
• Orig file: v2.3.99-pre5/linux/drivers/net/tulip/timer.c
• Orig date: Mon Mar 27 08:08:27 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/drivers/net/tulip/timer.c linux/drivers/net/tulip/timer.c
@@ -171,8 +171,10 @@
 	}
 	break;
 	}
-	tp->timer.expires = RUN_AT(next_tick);
-	add_timer(&tp->timer);
+	/* mod_timer synchronizes us with potential add_timer calls
+	 * from interrupts.
+	 */
+	mod_timer(&tp->timer, RUN_AT(next_tick));
 }
 
 
@@ -188,8 +190,7 @@
 			   inl(ioaddr + CSR12));
 	}
 	if (next_tick) {
-		tp->timer.expires = RUN_AT(next_tick);
-		add_timer(&tp->timer);
+		mod_timer(&tp->timer, RUN_AT(next_tick));
 	}
 }
 
@@ -205,7 +206,9 @@
 		printk(KERN_DEBUG "%s: Comet link status %4.4x partner capability "
 			   "%4.4x.\n",
 			   dev->name, inl(ioaddr + 0xB8), inl(ioaddr + 0xC8));
-	tp->timer.expires = RUN_AT(next_tick);
-	add_timer(&tp->timer);
+	/* mod_timer synchronizes us with potential add_timer calls
+	 * from interrupts.
+	 */
+	mod_timer(&tp->timer, RUN_AT(next_tick));
 }