Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

1 files changed, 2 insertions, 11 deletions

diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index a5d2f1fb4417..e535f1c988fe 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -107,17 +107,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
         }
 
         /* stop hardware - this must stop RX */
-        if (local->open_count) {
-                ieee80211_led_radio(local, false);
-                drv_stop(local);
-        }
-
-        /*
-         * flush again, in case driver queued work -- it
-         * shouldn't be doing (or cancel everything in the
-         * stop callback) that but better safe than sorry.
-         */
-        flush_workqueue(local->workqueue);
+        if (local->open_count)
+                ieee80211_stop_device(local);
 
         local->suspended = true;
         /* need suspended to be visible before quiescing is false */