From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from charlotte.tuxdriver.com ([70.61.120.58]:57156 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756628AbZLOUpm (ORCPT ); Tue, 15 Dec 2009 15:45:42 -0500 Date: Tue, 15 Dec 2009 15:44:32 -0500 From: "John W. Linville" To: Gertjan van Wingerde Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com, Ivo van Doorn , stable@kernel.org Subject: Re: [PATCH v2 2.6.33] rt2x00: Disable powersaving for rt61pci and rt2800pci. Message-ID: <20091215204432.GE8735@tuxdriver.com> References: <1260819235-8017-1-git-send-email-gwingerde@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1260819235-8017-1-git-send-email-gwingerde@gmail.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Mon, Dec 14, 2009 at 08:33:55PM +0100, Gertjan van Wingerde wrote: > We've had many reports of rt61pci failures with powersaving enabled. > Therefore, as a stop-gap measure, disable powersaving of the rt61pci > until we have found a proper solution. > Also disable powersaving on rt2800pci as it most probably will show > the same problem. > > Cc: stable@kernel.org > Signed-off-by: Gertjan van Wingerde > --- > > John, this is an urgent fix for 2.6.33. > > v2: > - Handled feedback from Ivo: > - Only disable powersaving by default, not permanent. > - Also apply to rt2800pci. As posted, it will only compile on 2.6.32... This is what I'm merging: diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index a199f85..6bf6c0f 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -2022,6 +2022,12 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) u16 eeprom; /* + * Disable powersaving as default on PCI devices. + */ + if (rt2x00_intf_is_pci(rt2x00dev)) + rt2x00dev->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; + + /* * Initialize all hw fields. */ rt2x00dev->hw->flags = diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 687e17d..0ca5893 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c @@ -2539,6 +2539,11 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) unsigned int i; /* + * Disable powersaving as default. + */ + rt2x00dev->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; + + /* * Initialize all hw fields. */ rt2x00dev->hw->flags = -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready.