[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4CBDC19A.60709@kernel.org>
Date: Tue, 19 Oct 2010 18:04:42 +0200
From: Tejun Heo <tj@...nel.org>
To: "David S. Miller" <davem@...emloft.net>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
lkml <linux-kernel@...r.kernel.org>
Subject: [PATCH v2.6.36-rc7] 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 <tj@...nel.org>
---
net/core/neighbour.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: work/net/core/neighbour.c
===================================================================
--- work.orig/net/core/neighbour.c
+++ 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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists