diff options
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/cfg80211.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 7188934b64d3..3d134a1fb96b 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -1150,7 +1150,6 @@ struct cfg80211_ops { | |||
1150 | enum nl80211_channel_type channel_type, | 1150 | enum nl80211_channel_type channel_type, |
1151 | const u8 *buf, size_t len, u64 *cookie); | 1151 | const u8 *buf, size_t len, u64 *cookie); |
1152 | 1152 | ||
1153 | /* some temporary stuff to finish wext */ | ||
1154 | int (*set_power_mgmt)(struct wiphy *wiphy, struct net_device *dev, | 1153 | int (*set_power_mgmt)(struct wiphy *wiphy, struct net_device *dev, |
1155 | bool enabled, int timeout); | 1154 | bool enabled, int timeout); |
1156 | }; | 1155 | }; |
@@ -1489,6 +1488,9 @@ struct wireless_dev { | |||
1489 | struct cfg80211_internal_bss *auth_bsses[MAX_AUTH_BSSES]; | 1488 | struct cfg80211_internal_bss *auth_bsses[MAX_AUTH_BSSES]; |
1490 | struct cfg80211_internal_bss *current_bss; /* associated / joined */ | 1489 | struct cfg80211_internal_bss *current_bss; /* associated / joined */ |
1491 | 1490 | ||
1491 | bool ps; | ||
1492 | int ps_timeout; | ||
1493 | |||
1492 | #ifdef CONFIG_CFG80211_WEXT | 1494 | #ifdef CONFIG_CFG80211_WEXT |
1493 | /* wext data */ | 1495 | /* wext data */ |
1494 | struct { | 1496 | struct { |
@@ -1500,8 +1502,7 @@ struct wireless_dev { | |||
1500 | u8 bssid[ETH_ALEN], prev_bssid[ETH_ALEN]; | 1502 | u8 bssid[ETH_ALEN], prev_bssid[ETH_ALEN]; |
1501 | u8 ssid[IEEE80211_MAX_SSID_LEN]; | 1503 | u8 ssid[IEEE80211_MAX_SSID_LEN]; |
1502 | s8 default_key, default_mgmt_key; | 1504 | s8 default_key, default_mgmt_key; |
1503 | bool ps, prev_bssid_valid; | 1505 | bool prev_bssid_valid; |
1504 | int ps_timeout; | ||
1505 | } wext; | 1506 | } wext; |
1506 | #endif | 1507 | #endif |
1507 | }; | 1508 | }; |