[PATCH v2.6.36-rc7] mac80211: cancel restart_work explicitly insteadof depending on flush_scheduled_work()

[Tejun Heo]

iee80211_hw->restart_work is the only work which uses the system
workqueue.  Instead of calling flush_scheduled_work() during
iee80211_exit(), cancel the work during unregistration.

This is to prepare for the deprecation and removal of
flush_scheduled_work().

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
---
 net/mac80211/main.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Index: work/net/mac80211/main.c
===================================================================
--- work.orig/net/mac80211/main.c
+++ work/net/mac80211/main.c
@@ -606,7 +606,7 @@ int ieee80211_register_hw(struct ieee802
 		hw->queues = IEEE80211_MAX_QUEUES;

 	local->workqueue =
-		create_singlethread_workqueue(wiphy_name(local->hw.wiphy));
+		alloc_ordered_workqueue(wiphy_name(local->hw.wiphy), 0);
 	if (!local->workqueue) {
 		result = -ENOMEM;
 		goto fail_workqueue;
@@ -739,6 +739,7 @@ void ieee80211_unregister_hw(struct ieee
 	del_timer_sync(&local->work_timer);

 	cancel_work_sync(&local->reconfig_filter);
+	cancel_work_sync(&local->restart_work);

 	ieee80211_clear_tx_pending(local);
 	sta_info_stop(local);
@@ -812,12 +813,6 @@ static void __exit ieee80211_exit(void)
 	rc80211_minstrel_ht_exit();
 	rc80211_minstrel_exit();

-	/*
-	 * For key todo, it'll be empty by now but the work
-	 * might still be scheduled.
-	 */
-	flush_scheduled_work();
-
 	if (mesh_allocated)
 		ieee80211s_stop();

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/