Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / hostap / hostap_hw.c

diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index b7cb165d612bfa9ec710a4d83b7b71d781150a71..a8bddd81b4d1d472cdccdff5f89befb1d06bdd61 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -3317,7 +3317,13 @@ static void prism2_free_local_data(struct net_device *dev)
 
        unregister_netdev(local->dev);
 
-       flush_scheduled_work();
+       flush_work_sync(&local->reset_queue);
+       flush_work_sync(&local->set_multicast_list_queue);
+       flush_work_sync(&local->set_tim_queue);
+#ifndef PRISM2_NO_STATION_MODES
+       flush_work_sync(&local->info_queue);
+#endif
+       flush_work_sync(&local->comms_qual_update);
 
        lib80211_crypt_info_free(&local->crypt_info);