diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-08 13:51:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-08 13:51:11 -0700 |
| commit | 9cf8d1a3b8cb19fa49494c1b8f0f9e3a37f2c218 (patch) | |
| tree | 0e9262488832ad27f6ba42680bf104872fa3c697 /net/mac80211/pm.c | |
| parent | 8391d07b80e8da957cd888870e23f8e218438622 (diff) | |
| parent | e9a68707d736f4f73d7e209885d7b4c5c452b1dc (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/pm.c')
| -rw-r--r-- | net/mac80211/pm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index ce671dfd238c..e37355193ed1 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c @@ -12,8 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw) struct ieee80211_sub_if_data *sdata; struct sta_info *sta; - if (unlikely(test_bit(SCAN_SW_SCANNING, &local->scanning))) - ieee80211_scan_cancel(local); + ieee80211_scan_cancel(local); ieee80211_stop_queues_by_reason(hw, IEEE80211_QUEUE_STOP_REASON_SUSPEND); @@ -46,7 +45,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw) list_for_each_entry(sta, &local->sta_list, list) { if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) { set_sta_flags(sta, WLAN_STA_BLOCK_BA); - ieee80211_sta_tear_down_BA_sessions(sta); + ieee80211_sta_tear_down_BA_sessions(sta, true); } if (sta->uploaded) { |