Commit 02f2d5a0 authored Mar 26, 2014 by Julia Lawall Committed by David S. Miller Mar 27, 2014

hsr: replace del_timer by del_timer_sync

Use del_timer_sync to ensure that the timer is stopped on all CPUs before
the driver exists.

This change was suggested by Thomas Gleixner.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@r@
declarer name module_exit;
identifier ex;
@@

module_exit(ex);

@@
identifier r.ex;
@@

ex(...) {
  <...
- del_timer
+ del_timer_sync
    (...)
  ...>
}
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 84275593

net/hsr/hsr_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -459,7 +459,7 @@ static int __init hsr_init(void)
	static void __exit hsr_exit(void)		static void __exit hsr_exit(void)
	{		{
	unregister_netdevice_notifier(&hsr_nb);		unregister_netdevice_notifier(&hsr_nb);
	del_timer(&prune_timer);		del_timer_sync(&prune_timer);
	hsr_netlink_exit();		hsr_netlink_exit();
	dev_remove_pack(&hsr_pt);		dev_remove_pack(&hsr_pt);
	}		}

Admin message