From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from kroah.org ([198.145.64.141]:55885 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935547AbZLQEFS (ORCPT ); Wed, 16 Dec 2009 23:05:18 -0500 Message-Id: <20091217035658.141592007@mini.kroah.org> Date: Wed, 16 Dec 2009 19:56:54 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org, greg@kroah.com Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, linux-wireless@vger.kernel.org, Sujith , "Luis R. Rodriguez" Subject: [117/151] ath9k: Fix TX hang poll routine In-Reply-To: <20091217040208.GA26571@kroah.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: 2.6.32-stable review patch. If anyone has any objections, please let us know. ------------------ From: Sujith This is a backport of upstream commit: 332c556633b8c5fb4e890b1783122f2315526590 When TX is hung, the chip is reset. Ensure that the chip is awake by using the PS wrappers. Signed-off-by: Sujith Signed-off-by: Luis R. Rodriguez Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/ath/ath9k/xmit.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -2065,7 +2065,9 @@ static void ath_tx_complete_poll_work(st if (needreset) { DPRINTF(sc, ATH_DBG_RESET, "tx hung, resetting the chip\n"); + ath9k_ps_wakeup(sc); ath_reset(sc, false); + ath9k_ps_restore(sc); } ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,