diff options
| author | Tejun Heo <tj@kernel.org> | 2010-10-19 02:04:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 07:25:48 -0400 |
| commit | a5c30b349b872aa2ac13babbd5ceb26737f17e95 (patch) | |
| tree | 4e26854e30b14c7df17c26084c48c94e9ce6d0a6 /net/core | |
| parent | be8c648051048bc66fbca590d00f3e8543ec32af (diff) | |
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@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/neighbour.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index b165b96355bf..8cc8f9a79db9 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
| @@ -1588,8 +1588,7 @@ int neigh_table_clear(struct neigh_table *tbl) | |||
| 1588 | struct neigh_table **tp; | 1588 | struct neigh_table **tp; |
| 1589 | 1589 | ||
| 1590 | /* It is not clean... Fix it to unload IPv6 module safely */ | 1590 | /* It is not clean... Fix it to unload IPv6 module safely */ |
| 1591 | cancel_delayed_work(&tbl->gc_work); | 1591 | cancel_delayed_work_sync(&tbl->gc_work); |
| 1592 | flush_scheduled_work(); | ||
| 1593 | del_timer_sync(&tbl->proxy_timer); | 1592 | del_timer_sync(&tbl->proxy_timer); |
| 1594 | pneigh_queue_purge(&tbl->proxy_queue); | 1593 | pneigh_queue_purge(&tbl->proxy_queue); |
| 1595 | neigh_ifdown(tbl, NULL); | 1594 | neigh_ifdown(tbl, NULL); |