diff options
author | rajan.aggarwal85@gmail.com <rajan.aggarwal85@gmail.com> | 2011-08-30 23:57:38 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-09-15 14:49:43 -0400 |
commit | d9e64f83ebb8f563810b10536b23516d3bd30e80 (patch) | |
tree | 6a7268d3f45d678021c5d26ee86cfff074292d47 | |
parent | 6b59e3191daade2b975eeec1c71c591eb5c86b7b (diff) | |
download | linux-stable-d9e64f83ebb8f563810b10536b23516d3bd30e80.tar.gz linux-stable-d9e64f83ebb8f563810b10536b23516d3bd30e80.tar.bz2 linux-stable-d9e64f83ebb8f563810b10536b23516d3bd30e80.zip |
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 <Rajan Aggarwal rajan.aggarwal85@gmail.com>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/can/af_can.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c index 8ce926d3b2cb..9b0c32a2690c 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(); |