diff options
author | Eliad Peller <eliad@wizery.com> | 2014-09-10 07:07:36 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-09-11 07:37:02 -0400 |
commit | 0d8614b4b926d0f657d15d7eb5125bcb24b9fd41 (patch) | |
tree | 144edc757011a4799f32d4e27dbf5c00124dfeba /drivers/net/wireless/mac80211_hwsim.c | |
parent | f69931748730763f8c8095fa88394cf9af75a578 (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 'drivers/net/wireless/mac80211_hwsim.c')
-rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 1326f6121835..babbdc1ce741 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c | |||
@@ -2045,8 +2045,6 @@ static int mac80211_hwsim_create_radio(int channels, const char *reg_alpha2, | |||
2045 | 2045 | ||
2046 | hw->flags = IEEE80211_HW_MFP_CAPABLE | | 2046 | hw->flags = IEEE80211_HW_MFP_CAPABLE | |
2047 | IEEE80211_HW_SIGNAL_DBM | | 2047 | IEEE80211_HW_SIGNAL_DBM | |
2048 | IEEE80211_HW_SUPPORTS_STATIC_SMPS | | ||
2049 | IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | | ||
2050 | IEEE80211_HW_AMPDU_AGGREGATION | | 2048 | IEEE80211_HW_AMPDU_AGGREGATION | |
2051 | IEEE80211_HW_WANT_MONITOR_VIF | | 2049 | IEEE80211_HW_WANT_MONITOR_VIF | |
2052 | IEEE80211_HW_QUEUE_CONTROL | | 2050 | IEEE80211_HW_QUEUE_CONTROL | |
@@ -2059,8 +2057,10 @@ static int mac80211_hwsim_create_radio(int channels, const char *reg_alpha2, | |||
2059 | WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL | | 2057 | WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL | |
2060 | WIPHY_FLAG_AP_UAPSD | | 2058 | WIPHY_FLAG_AP_UAPSD | |
2061 | WIPHY_FLAG_HAS_CHANNEL_SWITCH; | 2059 | WIPHY_FLAG_HAS_CHANNEL_SWITCH; |
2062 | hw->wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR; | 2060 | hw->wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR | |
2063 | hw->wiphy->features |= NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE; | 2061 | NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE | |
2062 | NL80211_FEATURE_STATIC_SMPS | | ||
2063 | NL80211_FEATURE_DYNAMIC_SMPS; | ||
2064 | 2064 | ||
2065 | /* ask mac80211 to reserve space for magic */ | 2065 | /* ask mac80211 to reserve space for magic */ |
2066 | hw->vif_data_size = sizeof(struct hwsim_vif_priv); | 2066 | hw->vif_data_size = sizeof(struct hwsim_vif_priv); |