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>

3 files changed, 3 insertions, 8 deletions

diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 574656174f91..54a189f0393e 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -303,11 +303,6 @@ static ssize_t hwflags_read(struct file *file, char __user *user_buf,
                 sf += scnprintf(buf + sf, mxln - sf, "SUPPORTS_DYNAMIC_PS\n");
         if (local->hw.flags & IEEE80211_HW_MFP_CAPABLE)
                 sf += scnprintf(buf + sf, mxln - sf, "MFP_CAPABLE\n");
-        if (local->hw.flags & IEEE80211_HW_SUPPORTS_STATIC_SMPS)
-                sf += scnprintf(buf + sf, mxln - sf, "SUPPORTS_STATIC_SMPS\n");
-        if (local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS)
-                sf += scnprintf(buf + sf, mxln - sf,
-                                "SUPPORTS_DYNAMIC_SMPS\n");
         if (local->hw.flags & IEEE80211_HW_SUPPORTS_UAPSD)
                 sf += scnprintf(buf + sf, mxln - sf, "SUPPORTS_UAPSD\n");
         if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
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,
         struct ieee80211_local *local = sdata->local;
         int err;
 
-        if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_STATIC_SMPS) &&
+        if (!(local->hw.wiphy->features & NL80211_FEATURE_STATIC_SMPS) &&
             smps_mode == IEEE80211_SMPS_STATIC)
                 return -EINVAL;
 
         /* auto should be dynamic if in PS mode */
-        if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS) &&
+        if (!(local->hw.wiphy->features & NL80211_FEATURE_DYNAMIC_SMPS) &&
             (smps_mode == IEEE80211_SMPS_DYNAMIC ||
              smps_mode == IEEE80211_SMPS_AUTOMATIC))
                 return -EINVAL;
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index efa41fc66c1f..9d4ccb2cf3c9 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3805,7 +3805,7 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
         ifmgd->uapsd_max_sp_len = sdata->local->hw.uapsd_max_sp_len;
         ifmgd->p2p_noa_index = -1;
 
-        if (sdata->local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS)
+        if (sdata->local->hw.wiphy->features & NL80211_FEATURE_DYNAMIC_SMPS)
                 ifmgd->req_smps = IEEE80211_SMPS_AUTOMATIC;
         else
                 ifmgd->req_smps = IEEE80211_SMPS_OFF;