Skip to contentSkip to conversation

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

PATCH Applied Tejun Heo 2 participants 2 messages Oct 19, 2010 – Oct 21, 2010

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Tejun Heo

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 net/core/neighbour.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/core/neighbour.c +1 -2
Index: work/net/core/neighbour.c
===================================================================
@@ -1486,8 +1486,7 @@ int neigh_table_clear(struct neigh_table
 	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);