nl80211: add power save commands

[pandora-kernel.git] / include / net / cfg80211.h

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 7188934..3d134a1 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1150,7 +1150,6 @@ struct cfg80211_ops {
                          enum nl80211_channel_type channel_type,
                          const u8 *buf, size_t len, u64 *cookie);
 
-       /* some temporary stuff to finish wext */
        int     (*set_power_mgmt)(struct wiphy *wiphy, struct net_device *dev,
                                  bool enabled, int timeout);
 };
@@ -1489,6 +1488,9 @@ struct wireless_dev {
        struct cfg80211_internal_bss *auth_bsses[MAX_AUTH_BSSES];
        struct cfg80211_internal_bss *current_bss; /* associated / joined */
 
+       bool ps;
+       int ps_timeout;
+
 #ifdef CONFIG_CFG80211_WEXT
        /* wext data */
        struct {
@@ -1500,8 +1502,7 @@ struct wireless_dev {
                u8 bssid[ETH_ALEN], prev_bssid[ETH_ALEN];
                u8 ssid[IEEE80211_MAX_SSID_LEN];
                s8 default_key, default_mgmt_key;
-               bool ps, prev_bssid_valid;
-               int ps_timeout;
+               bool prev_bssid_valid;
        } wext;
 #endif
 };