p54: re-enable power save feature

This patch re-enables p54's power save features and adds a workaround
which temporarily alters the device's power state in order to allow
ps-polls to be sent and buffered data to be retrieved during psm.

(Incorporates patch originally posted as "p54: fix beacon template dtim
IE corruption". -- JWL)

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index dc4f3f5ee0c8..349375f4a14b 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -585,7 +585,8 @@ int p54_set_ps(struct p54_common *priv)
         unsigned int i;
         u16 mode;
 
-        if (priv->hw->conf.flags & IEEE80211_CONF_PS)
+        if (priv->hw->conf.flags & IEEE80211_CONF_PS &&
+            !priv->powersave_override)
                 mode = P54_PSM | P54_PSM_BEACON_TIMEOUT | P54_PSM_DTIM |
                        P54_PSM_CHECKSUM | P54_PSM_MCBC;
         else
@@ -607,8 +608,8 @@ int p54_set_ps(struct p54_common *priv)
 
         psm->beacon_rssi_skip_max = 200;
         psm->rssi_delta_threshold = 0;
-        psm->nr = 10;
-        psm->exclude[0] = 0;
+        psm->nr = 1;
+        psm->exclude[0] = WLAN_EID_TIM;
 
         p54_tx(priv, skb);
         return 0;