patch-2.3.43 linux/drivers/net/shaper.c

• Lines: 19
• Date: Wed Feb 9 20:08:09 2000
• Orig file: v2.3.42/linux/drivers/net/shaper.c
• Orig date: Fri Jan 21 18:19:16 2000

diff -u --recursive --new-file v2.3.42/linux/drivers/net/shaper.c linux/drivers/net/shaper.c
@@ -287,6 +287,7 @@
 {
 	struct shaper *sh=(struct shaper *)data;
 	shaper_kick(sh);
+	timer_exit(&sh->timer);
 }
 
 /*
@@ -404,9 +405,7 @@
 {
 	struct shaper *shaper=dev->priv;
 	shaper_flush(shaper);
-	start_bh_atomic();
-	del_timer(&shaper->timer);
-	end_bh_atomic();
+	del_timer_sync(&shaper->timer);
 	MOD_DEC_USE_COUNT;
 	return 0;
 }