From patchwork Mon Dec 14 19:33:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gertjan van Wingerde X-Patchwork-Id: 67338 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nBEJe8P9000444 for ; Mon, 14 Dec 2009 19:40:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752899AbZLNTkG (ORCPT ); Mon, 14 Dec 2009 14:40:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752736AbZLNTkF (ORCPT ); Mon, 14 Dec 2009 14:40:05 -0500 Received: from cpsmtpm-eml105.kpnxchange.com ([195.121.3.9]:58984 "EHLO CPSMTPM-EML105.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752641AbZLNTkE (ORCPT ); Mon, 14 Dec 2009 14:40:04 -0500 Received: from wingerd.gvw.nl ([86.87.118.224]) by CPSMTPM-EML105.kpnxchange.com with Microsoft SMTPSVC(7.0.6001.18000); Mon, 14 Dec 2009 20:40:00 +0100 Received: by wingerd.gvw.nl (Postfix, from userid 501) id EFDE26002E; Mon, 14 Dec 2009 20:34:00 +0100 (CET) From: Gertjan van Wingerde To: linville@tuxdriver.com, linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com Cc: Ivo van Doorn , Gertjan van Wingerde , stable@kernel.org Subject: [PATCH v2 2.6.33] rt2x00: Disable powersaving for rt61pci and rt2800pci. Date: Mon, 14 Dec 2009 20:33:55 +0100 Message-Id: <1260819235-8017-1-git-send-email-gwingerde@gmail.com> X-Mailer: git-send-email 1.6.5.5 X-OriginalArrivalTime: 14 Dec 2009 19:40:00.0415 (UTC) FILETIME=[39547AF0:01CA7CF5] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 6e13650..fa197ac 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->ps_default = false; + + /* * 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..9440a4d 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->ps_default = false; + + /* * Initialize all hw fields. */ rt2x00dev->hw->flags =