summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2014-09-10 14:07:36 +0300
committerJohannes Berg <johannes.berg@intel.com>2014-09-11 13:37:02 +0200
commit0d8614b4b926d0f657d15d7eb5125bcb24b9fd41 (patch)
tree144edc757011a4799f32d4e27dbf5c00124dfeba /include
parentf69931748730763f8c8095fa88394cf9af75a578 (diff)
downloadlinux-stable-0d8614b4b926d0f657d15d7eb5125bcb24b9fd41.tar.gz
linux-stable-0d8614b4b926d0f657d15d7eb5125bcb24b9fd41.tar.bz2
linux-stable-0d8614b4b926d0f657d15d7eb5125bcb24b9fd41.zip
mac80211: replace SMPS hw flags with wiphy feature bits
Use the new static_smps / dynamic_smps feature bits instead of mac80211-internal hw flags. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/net/mac80211.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index c6e6a6804ee4..0ad1f47d2dc7 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1537,16 +1537,6 @@ struct ieee80211_tx_control {
* @IEEE80211_HW_MFP_CAPABLE:
* Hardware supports management frame protection (MFP, IEEE 802.11w).
*
- * @IEEE80211_HW_SUPPORTS_STATIC_SMPS:
- * Hardware supports static spatial multiplexing powersave,
- * ie. can turn off all but one chain even on HT connections
- * that should be using more chains.
- *
- * @IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS:
- * Hardware supports dynamic spatial multiplexing powersave,
- * ie. can turn off all but one chain and then wake the rest
- * up as required after, for example, rts/cts handshake.
- *
* @IEEE80211_HW_SUPPORTS_UAPSD:
* Hardware supports Unscheduled Automatic Power Save Delivery
* (U-APSD) in managed mode. The mode is configured with
@@ -1632,8 +1622,7 @@ enum ieee80211_hw_flags {
IEEE80211_HW_SUPPORTS_DYNAMIC_PS = 1<<12,
IEEE80211_HW_MFP_CAPABLE = 1<<13,
IEEE80211_HW_WANT_MONITOR_VIF = 1<<14,
- IEEE80211_HW_SUPPORTS_STATIC_SMPS = 1<<15,
- IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS = 1<<16,
+ /* free slots */
IEEE80211_HW_SUPPORTS_UAPSD = 1<<17,
IEEE80211_HW_REPORTS_TX_ACK_STATUS = 1<<18,
IEEE80211_HW_CONNECTION_MONITOR = 1<<19,