p54: power save management

This patch implements dynamic power save feature for p54.

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

diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index d85a6bafd79f3a9639bf4dacc50956b67424560e..6c175df48b0de69b147ce1f544fc3b56d8dc9eed 100644 (file)
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -1765,6 +1765,43 @@ static int p54_set_edcf(struct ieee80211_hw *dev)
        return 0;
 }
 
+static int p54_set_ps(struct ieee80211_hw *dev)
+{
+       struct p54_common *priv = dev->priv;
+       struct sk_buff *skb;
+       struct p54_psm *psm;
+       u16 mode;
+       int i;
+
+       if (dev->conf.flags & IEEE80211_CONF_PS)
+               mode = cpu_to_le16(P54_PSM | P54_PSM_DTIM | P54_PSM_MCBC);
+       else
+               mode = P54_PSM_CAM;
+
+       skb = p54_alloc_skb(dev, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*psm) +
+                       sizeof(struct p54_hdr), P54_CONTROL_TYPE_PSM,
+                       GFP_ATOMIC);
+       if (!skb)
+               return -ENOMEM;
+
+       psm = (struct p54_psm *)skb_put(skb, sizeof(*psm));
+       psm->mode = cpu_to_le16(mode);
+       psm->aid = cpu_to_le16(priv->aid);
+       for (i = 0; i < ARRAY_SIZE(psm->intervals); i++) {
+               psm->intervals[i].interval =
+                       cpu_to_le16(dev->conf.listen_interval);
+               psm->intervals[i].periods = 1;
+       }
+
+       psm->beacon_rssi_skip_max = 60;
+       psm->rssi_delta_threshold = 0;
+       psm->nr = 0;
+
+       priv->tx(dev, skb);
+
+       return 0;
+}
+
 static int p54_beacon_tim(struct sk_buff *skb)
 {
        /*
@@ -1957,6 +1994,11 @@ static int p54_config(struct ieee80211_hw *dev, u32 changed)
                if (ret)
                        goto out;
        }
+       if (changed & IEEE80211_CONF_CHANGE_PS) {
+               ret = p54_set_ps(dev);
+               if (ret)
+                       goto out;
+       }
 
 out:
        mutex_unlock(&priv->conf_mutex);

diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h
index 035e7731248445bedbe902b4da6fb51fa8c207a6..6207323848bd7f416f63f96e6877be74a85e67ad 100644 (file)
--- a/drivers/net/wireless/p54/p54common.h
+++ b/drivers/net/wireless/p54/p54common.h
@@ -534,6 +534,7 @@ struct p54_psm_interval {
        __le16 periods;
 } __attribute__ ((packed));
 
+#define P54_PSM_CAM                    0
 #define P54_PSM                                BIT(0)
 #define P54_PSM_DTIM                   BIT(1)
 #define P54_PSM_MCBC                   BIT(2)