Skip to contentSkip to conversation

rt2x00: Disable powersaving for rt61pci and rt2800pci.

PATCH In review Gertjan van Wingerde 3 participants 7 messages Dec 14, 2009 – Dec 15, 2009

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 rt2x00: Disable powersaving for rt61pci and rt2800pci.

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.

---

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.

---
 drivers/net/wireless/rt2x00/rt2800lib.c |    6 ++++++
 drivers/net/wireless/rt2x00/rt61pci.c   |    5 +++++
 2 files changed, 11 insertions(+), 0 deletions(-)
drivers/net/wireless/rt2x00/rt2800lib.c +6 -0
index 6e13650..fa197ac 100644
@@ -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 =
drivers/net/wireless/rt2x00/rt61pci.c +5 -0
index 687e17d..9440a4d 100644
@@ -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 =
Signature · 1 line
1.6.5.5
Acked-by on v2 1/1
#1 lore raw
Quoted 8 lines · Gertjan van Wingerde

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.

Quoted 14 lines

---

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.

---
 drivers/net/wireless/rt2x00/rt2800lib.c |    6 ++++++
 drivers/net/wireless/rt2x00/rt61pci.c   |    5 +++++
 2 files changed, 11 insertions(+), 0 deletions(-)
#2 lore raw
In reply to Gertjan van Wingerde
Quoted 8 lines · Gertjan van Wingerde

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.

Quoted 8 lines

---

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:

drivers/net/wireless/rt2x00/rt2800lib.c +6 -0
index a199f85..6bf6c0f 100644
@@ -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 =
drivers/net/wireless/rt2x00/rt61pci.c +5 -0
index 687e17d..0ca5893 100644
@@ -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 =
Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
#3 lore raw
Quoted 11 lines · John W. Linville
Quoted 10 lines · Gertjan van Wingerde

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.

---

Quoted 9 lines
Quoted 6 lines

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.

Quoted 34 lines

This is what I'm merging:

drivers/net/wireless/rt2x00/rt2800lib.c +6 -0
index a199f85..6bf6c0f 100644
@@ -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 =

drivers/net/wireless/rt2x00/rt61pci.c +5 -0
index 687e17d..0ca5893 100644
@@ -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.
         */
Quoted 1 line

       rt2x00dev->hw->flags =

Looks good to me.

---
Gertjan.

#4 lore raw
Quoted 20 lines · Gertjan van Wingerde
Quoted 18 lines · John W. Linville
Quoted 16 lines · Gertjan van Wingerde

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.

---

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.

Quoted 6 lines
Quoted 2 lines

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.

That seems rather impossible, since wireless-2.6 failed to build with your patch applied. :-) Perhaps you weren't up-to-date?

John

Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
#5 lore raw
Quoted 24 lines · John W. Linville
Quoted 23 lines · Gertjan van Wingerde
Quoted 20 lines · John W. Linville
Quoted 8 lines · Gertjan van Wingerde

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.

Quoted 8 lines

---

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...

Quoted 7 lines
Quoted 3 lines

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.

That seems rather impossible, since wireless-2.6 failed to build with your patch applied. :-)  Perhaps you weren't up-to-date?

Hmm, perhaps. Unfortunately I won't be back home until Friday. I'll check when I return there.

---
Gertjan.

#6 lore raw
In reply to John W. Linville
Quoted 24 lines · John W. Linville
Quoted 23 lines · Gertjan van Wingerde
Quoted 20 lines · John W. Linville
Quoted 8 lines · Gertjan van Wingerde

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.

Quoted 8 lines

---

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...

Quoted 6 lines
Quoted 3 lines

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.

That seems rather impossible, since wireless-2.6 failed to build with your patch applied. :-) Perhaps you weren't up-to-date?

For reference:

commit 5be83de54c16944dea9c16c6a5a53c1fa75ed304

Author: Johannes Berg <[email protected]>
Date:   Thu Nov 19 00:56:28 2009 +0100

cfg80211: convert bools into flags

We've accumulated a number of options for wiphys which make more sense as flags as we keep adding more. Convert the existing ones.

Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.