Commit a5c30b34 authored by Tejun Heo's avatar Tejun Heo Committed by David S. Miller
Browse files

net/neighbour: cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync() 



flush_scheduled_work() is going away.  Prepare for it.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be8c6480

net/core/neighbour.c

+1 −2
Original line number Diff line number Diff line
@@ -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);