Commit 1dbfd9d4 authored by Vivek Natarajan's avatar Vivek Natarajan Committed by John W. Linville

ath9k: Handle full sleep in ps_restore.

IDLE PS (Full Sleep) doesn't work when ifconfig up
is done during Idle unassociated state.
Fix this by restoring FULL SLEEP in ps_restore if CONF_IDLE
is set.
Signed-off-by: default avatarVivek Natarajan <vnatarajan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f276586a
...@@ -480,6 +480,7 @@ struct ath_softc { ...@@ -480,6 +480,7 @@ struct ath_softc {
u8 nbcnvifs; u8 nbcnvifs;
u16 nvifs; u16 nvifs;
bool ps_enabled; bool ps_enabled;
bool ps_idle;
unsigned long ps_usecount; unsigned long ps_usecount;
enum ath9k_int imask; enum ath9k_int imask;
......
...@@ -143,8 +143,10 @@ void ath9k_ps_restore(struct ath_softc *sc) ...@@ -143,8 +143,10 @@ void ath9k_ps_restore(struct ath_softc *sc)
if (--sc->ps_usecount != 0) if (--sc->ps_usecount != 0)
goto unlock; goto unlock;
if (sc->ps_enabled && if (sc->ps_idle)
!(sc->ps_flags & (PS_WAIT_FOR_BEACON | ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_FULL_SLEEP);
else if (sc->ps_enabled &&
!(sc->ps_flags & (PS_WAIT_FOR_BEACON |
PS_WAIT_FOR_CAB | PS_WAIT_FOR_CAB |
PS_WAIT_FOR_PSPOLL_DATA | PS_WAIT_FOR_PSPOLL_DATA |
PS_WAIT_FOR_TX_ACK))) PS_WAIT_FOR_TX_ACK)))
...@@ -1528,6 +1530,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) ...@@ -1528,6 +1530,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
spin_unlock_bh(&sc->wiphy_lock); spin_unlock_bh(&sc->wiphy_lock);
if (enable_radio) { if (enable_radio) {
sc->ps_idle = false;
ath_radio_enable(sc, hw); ath_radio_enable(sc, hw);
ath_print(common, ATH_DBG_CONFIG, ath_print(common, ATH_DBG_CONFIG,
"not-idle: enabling radio\n"); "not-idle: enabling radio\n");
...@@ -1635,6 +1638,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) ...@@ -1635,6 +1638,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
if (disable_radio) { if (disable_radio) {
ath_print(common, ATH_DBG_CONFIG, "idle: disabling radio\n"); ath_print(common, ATH_DBG_CONFIG, "idle: disabling radio\n");
sc->ps_idle = true;
ath_radio_disable(sc, hw); ath_radio_disable(sc, hw);
} }
......
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