mac80211: stop modifying HT SMPS capability

Instead of modifying the HT SMPS capability field
for stations, track the SMPS mode explicitly in a
new field in the station struct and use it in the
drivers that care about it. This simplifies the
code using it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

6 files changed, 20 insertions, 33 deletions

diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c
index f3b8e91aa3dc..e8324b5e5bfe 100644
--- a/drivers/net/wireless/iwlegacy/4965-rs.c
+++ b/drivers/net/wireless/iwlegacy/4965-rs.c
@@ -1183,8 +1183,7 @@ il4965_rs_switch_to_mimo2(struct il_priv *il, struct il_lq_sta *lq_sta,
         if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported)
                 return -1;
 
-        if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2) ==
-            WLAN_HT_CAP_SM_PS_STATIC)
+        if (sta->smps_mode == IEEE80211_SMPS_STATIC)
                 return -1;
 
         /* Need both Tx chains/antennas to support MIMO */
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 1f598604a79c..4c9aafb1b0cd 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -1830,32 +1830,30 @@ il_set_ht_add_station(struct il_priv *il, u8 idx, struct ieee80211_sta *sta)
 {
         struct ieee80211_sta_ht_cap *sta_ht_inf = &sta->ht_cap;
         __le32 sta_flags;
-        u8 mimo_ps_mode;
 
         if (!sta || !sta_ht_inf->ht_supported)
                 goto done;
 
-        mimo_ps_mode = (sta_ht_inf->cap & IEEE80211_HT_CAP_SM_PS) >> 2;
         D_ASSOC("spatial multiplexing power save mode: %s\n",
-                (mimo_ps_mode == WLAN_HT_CAP_SM_PS_STATIC) ? "static" :
-                (mimo_ps_mode == WLAN_HT_CAP_SM_PS_DYNAMIC) ? "dynamic" :
+                (sta->smps_mode == IEEE80211_SMPS_STATIC) ? "static" :
+                (sta->smps_mode == IEEE80211_SMPS_DYNAMIC) ? "dynamic" :
                 "disabled");
 
         sta_flags = il->stations[idx].sta.station_flags;
 
         sta_flags &= ~(STA_FLG_RTS_MIMO_PROT_MSK | STA_FLG_MIMO_DIS_MSK);
 
-        switch (mimo_ps_mode) {
-        case WLAN_HT_CAP_SM_PS_STATIC:
+        switch (sta->smps_mode) {
+        case IEEE80211_SMPS_STATIC:
                 sta_flags |= STA_FLG_MIMO_DIS_MSK;
                 break;
-        case WLAN_HT_CAP_SM_PS_DYNAMIC:
+        case IEEE80211_SMPS_DYNAMIC:
                 sta_flags |= STA_FLG_RTS_MIMO_PROT_MSK;
                 break;
-        case WLAN_HT_CAP_SM_PS_DISABLED:
+        case IEEE80211_SMPS_OFF:
                 break;
         default:
-                IL_WARN("Invalid MIMO PS mode %d\n", mimo_ps_mode);
+                IL_WARN("Invalid MIMO PS mode %d\n", sta->smps_mode);
                 break;
         }
 
diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c
index b25de02964f9..abe304267261 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.c
@@ -1289,8 +1289,7 @@ static int rs_switch_to_mimo2(struct iwl_priv *priv,
         if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported)
                 return -1;
 
-        if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2)
-                                                == WLAN_HT_CAP_SM_PS_STATIC)
+        if (sta->smps_mode == IEEE80211_SMPS_STATIC)
                 return -1;
 
         /* Need both Tx chains/antennas to support MIMO */
@@ -1345,8 +1344,7 @@ static int rs_switch_to_mimo3(struct iwl_priv *priv,
         if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported)
                 return -1;
 
-        if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2)
-                                                == WLAN_HT_CAP_SM_PS_STATIC)
+        if (sta->smps_mode == IEEE80211_SMPS_STATIC)
                 return -1;
 
         /* Need both Tx chains/antennas to support MIMO */
diff --git a/drivers/net/wireless/iwlwifi/dvm/sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c
index 6deab38c7aee..d5faf74c7991 100644
--- a/drivers/net/wireless/iwlwifi/dvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/dvm/sta.c
@@ -196,7 +196,6 @@ static void iwl_sta_calc_ht_flags(struct iwl_priv *priv,
                                   __le32 *flags, __le32 *mask)
 {
         struct ieee80211_sta_ht_cap *sta_ht_inf = &sta->ht_cap;
-        u8 mimo_ps_mode;
 
         *mask = STA_FLG_RTS_MIMO_PROT_MSK |
                 STA_FLG_MIMO_DIS_MSK |
@@ -208,26 +207,24 @@ static void iwl_sta_calc_ht_flags(struct iwl_priv *priv,
         if (!sta || !sta_ht_inf->ht_supported)
                 return;
 
-        mimo_ps_mode = (sta_ht_inf->cap & IEEE80211_HT_CAP_SM_PS) >> 2;
-
         IWL_DEBUG_INFO(priv, "STA %pM SM PS mode: %s\n",
                         sta->addr,
-                        (mimo_ps_mode == WLAN_HT_CAP_SM_PS_STATIC) ?
+                        (sta->smps_mode == IEEE80211_SMPS_STATIC) ?
                         "static" :
-                        (mimo_ps_mode == WLAN_HT_CAP_SM_PS_DYNAMIC) ?
+                        (sta->smps_mode == IEEE80211_SMPS_DYNAMIC) ?
                         "dynamic" : "disabled");
 
-        switch (mimo_ps_mode) {
-        case WLAN_HT_CAP_SM_PS_STATIC:
+        switch (sta->smps_mode) {
+        case IEEE80211_SMPS_STATIC:
                 *flags |= STA_FLG_MIMO_DIS_MSK;
                 break;
-        case WLAN_HT_CAP_SM_PS_DYNAMIC:
+        case IEEE80211_SMPS_DYNAMIC:
                 *flags |= STA_FLG_RTS_MIMO_PROT_MSK;
                 break;
-        case WLAN_HT_CAP_SM_PS_DISABLED:
+        case IEEE80211_SMPS_OFF:
                 break;
         default:
-                IWL_WARN(priv, "Invalid MIMO PS mode %d\n", mimo_ps_mode);
+                IWL_WARN(priv, "Invalid MIMO PS mode %d\n", sta->smps_mode);
                 break;
         }
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index 8ba36e5e4b67..56b636d9ab30 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -1229,8 +1229,7 @@ static int rs_switch_to_mimo2(struct iwl_mvm *mvm,
         if (!sta->ht_cap.ht_supported)
                 return -1;
 
-        if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2)
-                                                == WLAN_HT_CAP_SM_PS_STATIC)
+        if (sta->smps_mode == IEEE80211_SMPS_STATIC)
                 return -1;
 
         /* Need both Tx chains/antennas to support MIMO */
@@ -1282,8 +1281,7 @@ static int rs_switch_to_mimo3(struct iwl_mvm *mvm,
         if (!sta->ht_cap.ht_supported)
                 return -1;
 
-        if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2)
-                                                == WLAN_HT_CAP_SM_PS_STATIC)
+        if (sta->smps_mode == IEEE80211_SMPS_STATIC)
                 return -1;
 
         /* Need both Tx chains/antennas to support MIMO */
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index f35d85a71bbc..9503e6954b89 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -343,10 +343,7 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev,
                  * when using more then one tx stream (>MCS7).
                  */
                 if (sta && txdesc->u.ht.mcs > 7 &&
-                    ((sta->ht_cap.cap &
-                      IEEE80211_HT_CAP_SM_PS) >>
-                     IEEE80211_HT_CAP_SM_PS_SHIFT) ==
-                    WLAN_HT_CAP_SM_PS_DYNAMIC)
+                    sta->smps_mode == IEEE80211_SMPS_DYNAMIC)
                         __set_bit(ENTRY_TXD_HT_MIMO_PS, &txdesc->flags);
         } else {
                 txdesc->u.ht.mcs = rt2x00_get_rate_mcs(hwrate->mcs);