OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hostap: don't use flush_scheduled_work()

Browse Source 
flush_scheduled_work() is on its way out.  Drop flush_scheduled_work()
from prism2_free_local_data() and replace it with explicit flushing of
work items on the respective free functions.  Work items in ap_data
are flushed from hostap_free_data() and the ones in local_info from
prism2_free_local_data().

Flush is used instead of cancel as some process and free items from
queue.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jes Sorensen <jes@trained-monkey.org>
Cc: netdev@vger.kernel.org
This commit is contained in:
Tejun Heo 2010-12-12 16:45:15 +01:00
parent 781ba45676
commit 1635953305
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/hostap/hostap_ap.c
View File

@ -858,7 +858,10 @@ void hostap_free_data(struct ap_data *ap)
return;
}
flush_work_sync(&ap->add_sta_proc_queue);
#ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
flush_work_sync(&ap->wds_oper_queue);
if (ap->crypt)
ap->crypt->deinit(ap->crypt_priv);
ap->crypt = ap->crypt_priv = NULL;

8
drivers/net/wireless/hostap/hostap_hw.c
View File

@ -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);