From patchwork Tue Sep 14 23:40:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Rodriguez X-Patchwork-Id: 181432 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8ENegD1010095 for ; Tue, 14 Sep 2010 23:40:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755876Ab0INXkk (ORCPT ); Tue, 14 Sep 2010 19:40:40 -0400 Received: from bombadil.infradead.org ([18.85.46.34]:59043 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755861Ab0INXkj (ORCPT ); Tue, 14 Sep 2010 19:40:39 -0400 Received: from mcgrof by bombadil.infradead.org with local (Exim 4.72 #1 (Red Hat Linux)) id 1Ovf6u-0004jv-JH; Tue, 14 Sep 2010 23:40:24 +0000 From: "Luis R. Rodriguez" To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Senthil Balasubramanian , stable@kernel.org, Paul Stewart , Sameer Nanda , Gabor Juhos , Amod Bodas , "Luis R. Rodriguez" Subject: [PATCH v3 10/11] ath9k: fix regression which prevents chip sleep after CAB data Date: Tue, 14 Sep 2010 19:40:23 -0400 Message-Id: <1284507624-18176-11-git-send-email-lrodriguez@atheros.com> X-Mailer: git-send-email 1.6.2.rc1.3.g81d3f In-Reply-To: <1284507624-18176-1-git-send-email-lrodriguez@atheros.com> References: <1284507624-18176-1-git-send-email-lrodriguez@atheros.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Sep 2010 23:40:42 +0000 (UTC) diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index efd0651..dbd4b0c 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c @@ -639,7 +639,7 @@ static void ath_rx_ps(struct ath_softc *sc, struct sk_buff *skb) * 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) &&