From: Tejun Heo Date: Tue, 19 Oct 2010 06:04:42 +0000 (+0000) Subject: net/neighbour: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_... X-Git-Tag: v2.6.37-rc1~147^2~19 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=a5c30b349b872aa2ac13babbd5ceb26737f17e95;p=net-next-2.6.git 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 Signed-off-by: David S. Miller --- diff --git a/net/core/neighbour.c b/net/core/neighbour.c index b165b96355b..8cc8f9a79db 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);