diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-03-13 06:43:36 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-03-27 20:12:52 -0400 |
commit | 25420604c8967ff24f087dd7b9cd4b278567d39a (patch) | |
tree | b5a1c0edcca74cf64abce8bd6699774c0c387838 /net/mac80211/pm.c | |
parent | b5bde374f0f61f5d97114d400ade8fc96bf6f10d (diff) |
mac80211: stop queues across suspend/resume
Even though userland probably cannot submit packets, there might
still be some coming, and that's no good when the driver doesn't
expect them. Stop the queues across suspend/resume.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/pm.c')
-rw-r--r-- | net/mac80211/pm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index 44525f517077..c923ceb089a3 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c | |||
@@ -11,6 +11,9 @@ int __ieee80211_suspend(struct ieee80211_hw *hw) | |||
11 | struct ieee80211_if_init_conf conf; | 11 | struct ieee80211_if_init_conf conf; |
12 | struct sta_info *sta; | 12 | struct sta_info *sta; |
13 | 13 | ||
14 | ieee80211_stop_queues_by_reason(hw, | ||
15 | IEEE80211_QUEUE_STOP_REASON_SUSPEND); | ||
16 | |||
14 | flush_workqueue(local->hw.workqueue); | 17 | flush_workqueue(local->hw.workqueue); |
15 | 18 | ||
16 | /* disable keys */ | 19 | /* disable keys */ |
@@ -113,5 +116,8 @@ int __ieee80211_resume(struct ieee80211_hw *hw) | |||
113 | ieee80211_configure_filter(local); | 116 | ieee80211_configure_filter(local); |
114 | netif_addr_unlock_bh(local->mdev); | 117 | netif_addr_unlock_bh(local->mdev); |
115 | 118 | ||
119 | ieee80211_wake_queues_by_reason(hw, | ||
120 | IEEE80211_QUEUE_STOP_REASON_SUSPEND); | ||
121 | |||
116 | return 0; | 122 | return 0; |
117 | } | 123 | } |