patch-2.4.0-test3 linux/drivers/net/tulip/21142.c

• Lines: 18
• Date: Thu Jun 29 10:14:01 2000
• Orig file: v2.4.0-test2/linux/drivers/net/tulip/21142.c
• Orig date: Fri Jun 23 21:55:09 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/net/tulip/21142.c linux/drivers/net/tulip/21142.c
@@ -198,7 +198,7 @@
 				&& (csr12 & 2) == 2) ||
 			   (tp->nway && (csr5 & (TPLnkFail)))) {
 		/* Link blew? Maybe restart NWay. */
-		del_timer(&tp->timer);
+		del_timer_sync(&tp->timer);
 		t21142_start_nway(dev);
 		tp->timer.expires = RUN_AT(3*HZ);
 		add_timer(&tp->timer);
@@ -208,7 +208,7 @@
 				   dev->name, medianame[dev->if_port],
 				   (csr12 & 2) ? "failed" : "good");
 		if ((csr12 & 2)  &&  ! tp->medialock) {
-			del_timer(&tp->timer);
+			del_timer_sync(&tp->timer);
 			t21142_start_nway(dev);
 			tp->timer.expires = RUN_AT(3*HZ);
 			add_timer(&tp->timer);