Skip to content

Commit

Permalink
mac80211: change workqueue back to non-freezeable
Browse files Browse the repository at this point in the history
"mac80211: make workqueue freezable" made the mac80211
workqueue freezeable to prevent us from doing any work after the
driver went away.  This was fine before mac80211 had any suspend
support.

However, now we want to flush this workqueue in suspend().  Because
the thread for a freezeable workqueue is stopped before the device
class suspend() is called, flush_workqueue() will hang in the
suspend-to-disk case.

Converting it back to a non-freezeable queue will keep suspend from
hanging.  Moreover, since we flush the workqueue under RTNL and
userspace is stopped, there won't be any new work in the workqueue
until after resume.  Thus we still don't have to worry about pinging
the AP without hardware.

Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Bob Copeland authored and John W. Linville committed Jan 29, 2009
1 parent dfe6701 commit 30d3ef4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/mac80211/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
mdev->set_multicast_list = ieee80211_master_set_multicast_list;

local->hw.workqueue =
create_freezeable_workqueue(wiphy_name(local->hw.wiphy));
create_singlethread_workqueue(wiphy_name(local->hw.wiphy));
if (!local->hw.workqueue) {
result = -ENOMEM;
goto fail_workqueue;
Expand Down

0 comments on commit 30d3ef4

Please sign in to comment.