From 8e137c376aa6d78dfb3b43f04ef923c0c294d1ac Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Tue, 19 Oct 2010 06:04:42 +0000
Subject: [PATCH] --- yaml --- r: 215428 b: refs/heads/master c:
 a5c30b349b872aa2ac13babbd5ceb26737f17e95 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/neighbour.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 494c95713040..bf48fa3ae60c 100644
--- 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
index b165b96355bf..8cc8f9a79db9 100644
--- 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);