Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 011afa1e authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

Revert "ath9k: fix going to full-sleep on PS idle" 



This reverts commit c1afdaff.

Users have reported connection failures in 3.3.1 and suspend/resume
failures in 3.4-rcX. Revert this commit for now - PS IDLE can be
fixed in a clean manner later on.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e2bc7c5f

drivers/net/wireless/ath/ath9k/main.c

+3 −5
Original line number Diff line number Diff line
@@ -118,15 +118,13 @@ void ath9k_ps_restore(struct ath_softc *sc) 
	if (--sc->ps_usecount != 0)

		goto unlock;



	if (sc->ps_flags & PS_WAIT_FOR_TX_ACK)

		goto unlock;



	if (sc->ps_idle)

	if (sc->ps_idle && (sc->ps_flags & PS_WAIT_FOR_TX_ACK))

		mode = ATH9K_PM_FULL_SLEEP;

	else if (sc->ps_enabled &&

		 !(sc->ps_flags & (PS_WAIT_FOR_BEACON |

			      PS_WAIT_FOR_CAB |

			      PS_WAIT_FOR_PSPOLL_DATA)))

			      PS_WAIT_FOR_PSPOLL_DATA |

			      PS_WAIT_FOR_TX_ACK)))

		mode = ATH9K_PM_NETWORK_SLEEP;

	else

		goto unlock;