diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-03-10 07:57:04 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-12 14:21:53 -0400 |
| commit | c1afdaff90538ef085b756454f12b29575411214 (patch) | |
| tree | 932f83b57eccb2040d4d3c62cc158be01cbbbc02 | |
| parent | ffb1c56a9706c7e4f1911faa14626b2bb3973479 (diff) | |
ath9k: fix going to full-sleep on PS idle
The check for PS_WAIT_FOR_TX_ACK was inverted, the hardware should only go
to full sleep if no tx is pending.
Reported-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@vger.kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 33403a92e45f..4a9901090811 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
| @@ -118,13 +118,15 @@ void ath9k_ps_restore(struct ath_softc *sc) | |||
| 118 | if (--sc->ps_usecount != 0) | 118 | if (--sc->ps_usecount != 0) |
| 119 | goto unlock; | 119 | goto unlock; |
| 120 | 120 | ||
| 121 | if (sc->ps_idle && (sc->ps_flags & PS_WAIT_FOR_TX_ACK)) | 121 | if (sc->ps_flags & PS_WAIT_FOR_TX_ACK) |
| 122 | goto unlock; | ||
| 123 | |||
| 124 | if (sc->ps_idle) | ||
| 122 | mode = ATH9K_PM_FULL_SLEEP; | 125 | mode = ATH9K_PM_FULL_SLEEP; |
| 123 | else if (sc->ps_enabled && | 126 | else if (sc->ps_enabled && |
| 124 | !(sc->ps_flags & (PS_WAIT_FOR_BEACON | | 127 | !(sc->ps_flags & (PS_WAIT_FOR_BEACON | |
| 125 | PS_WAIT_FOR_CAB | | 128 | PS_WAIT_FOR_CAB | |
| 126 | PS_WAIT_FOR_PSPOLL_DATA | | 129 | PS_WAIT_FOR_PSPOLL_DATA))) |
| 127 | PS_WAIT_FOR_TX_ACK))) | ||
| 128 | mode = ATH9K_PM_NETWORK_SLEEP; | 130 | mode = ATH9K_PM_NETWORK_SLEEP; |
| 129 | else | 131 | else |
| 130 | goto unlock; | 132 | goto unlock; |