projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20140405' of git://git.infradead.org/linux-mtd
[firefly-linux-kernel-4.4.55.git]
/
net
/
hsr
/
hsr_main.c
diff --git
a/net/hsr/hsr_main.c
b/net/hsr/hsr_main.c
index 10010c543edf6df6773d6046f440ca68bc5b4c30..3fee5218a691f20c8b028e7ed2738febc7dfd0b7 100644
(file)
--- a/
net/hsr/hsr_main.c
+++ b/
net/hsr/hsr_main.c
@@
-459,7
+459,7
@@
static int __init hsr_init(void)
static void __exit hsr_exit(void)
{
unregister_netdevice_notifier(&hsr_nb);
- del_timer(&prune_timer);
+ del_timer
_sync
(&prune_timer);
hsr_netlink_exit();
dev_remove_pack(&hsr_pt);
}