On Tue, Dec 15, 2009 at 9:44 PM, John W. Linville <linville@xxxxxxxxxxxxx> wrote: > 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@xxxxxxxxxx >> Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx> >> --- >> >> 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... > Me confused, as the patch was against the wireless-2.6.git tree, which I thought was 2.6.33, and not 2.6.32. Please explain to which tree to prepare fixes for 2.6.33. > 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 = Looks good to me. --- Gertjan. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
