[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20101208005723.295279289@clark.site>
Date: Tue, 07 Dec 2010 16:56:36 -0800
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Paul Stewart <pstew@...gle.com>,
Sameer Nanda <snanda@...gle.com>,
Gabor Juhos <juhosg@...nwrt.org>,
Amod Bodas <amod.bodas@...eros.com>,
Senthil Balasubramanian <senthilkumar@...eros.com>,
"Luis R. Rodriguez" <lrodriguez@...eros.com>,
"John W. Linville" <linville@...driver.com>
Subject: [019/289] ath9k: fix regression which prevents chip sleep after CAB data
2.6.36-stable review patch. If anyone has any objections, please let us know.
------------------
From: Senthil Balasubramanian <senthilkumar@...eros.com>
commit 3fac6dfdcd2b893c22b20a03dd1bf1af8b627c4b upstream.
The patch:
commit 293dc5dfdbcc16cde06e40a688394cc8ab083e48
Author: Gabor Juhos <juhosg@...nwrt.org>
Date: Fri Jun 19 12:17:48 2009 +0200
ath9k: remove ath_rx_ps_back_to_sleep helper
This helper only clears the SC_OP_WAIT_FOR_{BEACON,CAB} flags.
Remove it and clear these flags directly in the approptiate
places instead.
Changes-licensed-under: ISC
Signed-off-by: Gabor Juhos <juhosg@...nwrt.org>
Signed-off-by: John W. Linville <linville@...driver.com>
introduced a regression which forgot to lift the beacon flag
after we received all broadcast and multicast data. This meant
we never went to sleep consuming about ~650mW on idle. This pretty
much broke power save completely.
This patch has fixes for stable kernels [2.6.32+].
Cc: Paul Stewart <pstew@...gle.com>
Cc: Sameer Nanda <snanda@...gle.com>
Cc: Gabor Juhos <juhosg@...nwrt.org>
Cc: Amod Bodas <amod.bodas@...eros.com>
Signed-off-by: Senthil Balasubramanian <senthilkumar@...eros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@...eros.com>
Signed-off-by: John W. Linville <linville@...driver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
drivers/net/wireless/ath/ath9k/recv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -631,7 +631,7 @@ static void ath_rx_ps(struct ath_softc *
* No more broadcast/multicast frames to be received at this
* point.
*/
- sc->ps_flags &= ~PS_WAIT_FOR_CAB;
+ sc->ps_flags &= ~(PS_WAIT_FOR_CAB | PS_WAIT_FOR_BEACON);
ath_print(common, ATH_DBG_PS,
"All PS CAB frames received, back to sleep\n");
} else if ((sc->ps_flags & PS_WAIT_FOR_PSPOLL_DATA) &&
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists