summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-10-19 10:04:42 +0400
committerDavid S. Miller <davem@davemloft.net>2010-10-21 15:25:48 +0400
commita5c30b349b872aa2ac13babbd5ceb26737f17e95 (patch)
tree4e26854e30b14c7df17c26084c48c94e9ce6d0a6 /net
parentbe8c648051048bc66fbca590d00f3e8543ec32af (diff)
downloadlinux-a5c30b349b872aa2ac13babbd5ceb26737f17e95.tar.xz
net/neighbour: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync()
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>
Diffstat (limited to 'net')
-rw-r--r--net/core/neighbour.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index b165b96355bf..8cc8f9a79db9 100644
--- 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);