---

yaml --- r: 215428 b: refs/heads/master c: a5c30b3 h: refs/heads/master v: v3
git-mirror · Oct 21, 2010 · 8e137c3 · 8e137c3
1 parent 06f33ce
commit 8e137c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be8c648051048bc66fbca590d00f3e8543ec32af
+refs/heads/master: a5c30b349b872aa2ac13babbd5ceb26737f17e95
diff --git a/trunk/net/core/neighbour.c b/trunk/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);