projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
be8c648
)
net/neighbour: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_...
author
Tejun Heo
<tj@kernel.org>
Tue, 19 Oct 2010 06:04:42 +0000
(06:04 +0000)
committer
David S. Miller
<davem@davemloft.net>
Thu, 21 Oct 2010 11:25:48 +0000
(
04:25
-0700)
flush_scheduled_work() is going away. Prepare for it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/neighbour.c
patch
|
blob
|
blame
|
history
diff --git
a/net/core/neighbour.c
b/net/core/neighbour.c
index b165b96355bfc05245b43fae754f8358942e217f..8cc8f9a79db91fe20a86ad46b0199c3e98ebe8ac 100644
(file)
--- a/
net/core/neighbour.c
+++ b/
net/core/neighbour.c
@@
-1588,8
+1588,7
@@
int neigh_table_clear(struct neigh_table *tbl)
struct neigh_table **tp;
/* It is not clean... Fix it to unload IPv6 module safely */
- cancel_delayed_work(&tbl->gc_work);
- flush_scheduled_work();
+ cancel_delayed_work_sync(&tbl->gc_work);
del_timer_sync(&tbl->proxy_timer);
pneigh_queue_purge(&tbl->proxy_queue);
neigh_ifdown(tbl, NULL);