aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/debugfs_netdev.c
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2014-09-10 07:07:36 -0400
committerJohannes Berg <johannes.berg@intel.com>2014-09-11 07:37:02 -0400
commit0d8614b4b926d0f657d15d7eb5125bcb24b9fd41 (patch)
tree144edc757011a4799f32d4e27dbf5c00124dfeba /net/mac80211/debugfs_netdev.c
parentf69931748730763f8c8095fa88394cf9af75a578 (diff)
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 'net/mac80211/debugfs_netdev.c')
-rw-r--r--net/mac80211/debugfs_netdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index e205ebabfa50..c68896adfa96 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -226,12 +226,12 @@ static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata,
226 struct ieee80211_local *local = sdata->local; 226 struct ieee80211_local *local = sdata->local;
227 int err; 227 int err;
228 228
229 if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_STATIC_SMPS) && 229 if (!(local->hw.wiphy->features & NL80211_FEATURE_STATIC_SMPS) &&
230 smps_mode == IEEE80211_SMPS_STATIC) 230 smps_mode == IEEE80211_SMPS_STATIC)
231 return -EINVAL; 231 return -EINVAL;
232 232
233 /* auto should be dynamic if in PS mode */ 233 /* auto should be dynamic if in PS mode */
234 if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS) && 234 if (!(local->hw.wiphy->features & NL80211_FEATURE_DYNAMIC_SMPS) &&
235 (smps_mode == IEEE80211_SMPS_DYNAMIC || 235 (smps_mode == IEEE80211_SMPS_DYNAMIC ||
236 smps_mode == IEEE80211_SMPS_AUTOMATIC)) 236 smps_mode == IEEE80211_SMPS_AUTOMATIC))
237 return -EINVAL; 237 return -EINVAL;