Commit 25420604 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b5bde374
...@@ -598,6 +598,7 @@ enum queue_stop_reason { ...@@ -598,6 +598,7 @@ enum queue_stop_reason {
IEEE80211_QUEUE_STOP_REASON_PS, IEEE80211_QUEUE_STOP_REASON_PS,
IEEE80211_QUEUE_STOP_REASON_CSA, IEEE80211_QUEUE_STOP_REASON_CSA,
IEEE80211_QUEUE_STOP_REASON_AGGREGATION, IEEE80211_QUEUE_STOP_REASON_AGGREGATION,
IEEE80211_QUEUE_STOP_REASON_SUSPEND,
}; };
struct ieee80211_master_priv { struct ieee80211_master_priv {
......
...@@ -11,6 +11,9 @@ int __ieee80211_suspend(struct ieee80211_hw *hw) ...@@ -11,6 +11,9 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
struct ieee80211_if_init_conf conf; struct ieee80211_if_init_conf conf;
struct sta_info *sta; struct sta_info *sta;
ieee80211_stop_queues_by_reason(hw,
IEEE80211_QUEUE_STOP_REASON_SUSPEND);
flush_workqueue(local->hw.workqueue); flush_workqueue(local->hw.workqueue);
/* disable keys */ /* disable keys */
...@@ -113,5 +116,8 @@ int __ieee80211_resume(struct ieee80211_hw *hw) ...@@ -113,5 +116,8 @@ int __ieee80211_resume(struct ieee80211_hw *hw)
ieee80211_configure_filter(local); ieee80211_configure_filter(local);
netif_addr_unlock_bh(local->mdev); netif_addr_unlock_bh(local->mdev);
ieee80211_wake_queues_by_reason(hw,
IEEE80211_QUEUE_STOP_REASON_SUSPEND);
return 0; return 0;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment