2012-07-10 23:42:30 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/main.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
2012-09-08 11:10:54 +00:00
|
|
|
@@ -1087,6 +1087,7 @@ static void ath9k_remove_interface(struc
|
2012-07-10 23:42:30 +00:00
|
|
|
ath9k_calculate_summary_state(hw, NULL);
|
|
|
|
|
|
|
|
|
|
mutex_unlock(&sc->mutex);
|
|
|
|
|
+ ath9k_config(hw, IEEE80211_CONF_CHANGE_IDLE);
|
|
|
|
|
ath9k_ps_restore(sc);
|
|
|
|
|
}
|
|
|
|
|
|
2012-09-08 11:10:54 +00:00
|
|
|
@@ -1139,7 +1140,8 @@ int ath9k_config(struct ieee80211_hw *hw
|
2012-07-10 23:42:30 +00:00
|
|
|
mutex_lock(&sc->mutex);
|
|
|
|
|
|
|
|
|
|
if (changed & IEEE80211_CONF_CHANGE_IDLE) {
|
|
|
|
|
- sc->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE);
|
|
|
|
|
+ sc->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE) &&
|
|
|
|
|
+ !sc->nvifs;
|
|
|
|
|
if (sc->ps_idle) {
|
|
|
|
|
ath_cancel_work(sc);
|
|
|
|
|
ath9k_stop_btcoex(sc);
|
