From: rajan.aggarwal85@gmail.com Date: Tue, 30 Aug 2011 23:57:38 +0000 (+0000) Subject: net/can/af_can.c: Change del_timer to del_timer_sync X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d9e64f83ebb8f563810b10536b23516d3bd30e80;p=~shefty%2Frdma-dev.git net/can/af_can.c: Change del_timer to del_timer_sync This is important for SMP platform to check if timer function is executing on other CPU with deleting the timer. Signed-off-by: Rajan Aggarwal Acked-by: Oliver Hartkopp Signed-off-by: David S. Miller --- diff --git a/net/can/af_can.c b/net/can/af_can.c index 8ce926d3b2c..9b0c32a2690 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -857,7 +857,7 @@ static __exit void can_exit(void) struct net_device *dev; if (stats_timer) - del_timer(&can_stattimer); + del_timer_sync(&can_stattimer); can_remove_proc();