|
|
|
@ -1614,7 +1614,37 @@
|
|
|
|
|
mode = ATH9K_PM_NETWORK_SLEEP;
|
|
|
|
|
else
|
|
|
|
|
goto unlock;
|
|
|
|
|
@@ -1955,6 +1957,7 @@ static void ath9k_config_bss(struct ath_
|
|
|
|
|
@@ -1559,6 +1561,7 @@ static int ath9k_config(struct ieee80211
|
|
|
|
|
struct ath_hw *ah = sc->sc_ah;
|
|
|
|
|
struct ath_common *common = ath9k_hw_common(ah);
|
|
|
|
|
struct ieee80211_conf *conf = &hw->conf;
|
|
|
|
|
+ bool reset_channel = false;
|
|
|
|
|
|
|
|
|
|
ath9k_ps_wakeup(sc);
|
|
|
|
|
mutex_lock(&sc->mutex);
|
|
|
|
|
@@ -1567,6 +1570,12 @@ static int ath9k_config(struct ieee80211
|
|
|
|
|
sc->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE);
|
|
|
|
|
if (sc->ps_idle)
|
|
|
|
|
ath_cancel_work(sc);
|
|
|
|
|
+ else
|
|
|
|
|
+ /*
|
|
|
|
|
+ * The chip needs a reset to properly wake up from
|
|
|
|
|
+ * full sleep
|
|
|
|
|
+ */
|
|
|
|
|
+ reset_channel = ah->chip_fullsleep;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
@@ -1595,7 +1604,7 @@ static int ath9k_config(struct ieee80211
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
|
|
|
|
|
+ if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
|
|
|
|
|
struct ieee80211_channel *curchan = hw->conf.channel;
|
|
|
|
|
int pos = curchan->hw_value;
|
|
|
|
|
int old_pos = -1;
|
|
|
|
|
@@ -1955,6 +1964,7 @@ static void ath9k_config_bss(struct ath_
|
|
|
|
|
sc->sc_flags &= ~SC_OP_ANI_RUN;
|
|
|
|
|
del_timer_sync(&common->ani.timer);
|
|
|
|
|
memset(&sc->caldata, 0, sizeof(sc->caldata));
|
|
|
|
@ -1622,7 +1652,7 @@
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -2300,6 +2303,7 @@ static int ath9k_tx_last_beacon(struct i
|
|
|
|
|
@@ -2300,6 +2310,7 @@ static int ath9k_tx_last_beacon(struct i
|
|
|
|
|
struct ath_vif *avp;
|
|
|
|
|
struct ath_buf *bf;
|
|
|
|
|
struct ath_tx_status ts;
|
|
|
|
@ -1630,7 +1660,7 @@
|
|
|
|
|
int status;
|
|
|
|
|
|
|
|
|
|
vif = sc->beacon.bslot[0];
|
|
|
|
|
@@ -2310,7 +2314,7 @@ static int ath9k_tx_last_beacon(struct i
|
|
|
|
|
@@ -2310,7 +2321,7 @@ static int ath9k_tx_last_beacon(struct i
|
|
|
|
|
if (!avp->is_bslot_active)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|