diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-12 08:21:00 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 03:41:41 -0500 |
| commit | af0ed69badc67a0b6e976543f52029fce9ac8f69 (patch) | |
| tree | 95f35f3f70f3fd949beda47ad3cee838b0c343c1 /drivers/net/wireless/iwlwifi/dvm/rs.c | |
| parent | 9fb04b501a57ad29fa989ab3cd2123482e7eac5f (diff) | |
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/rs.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/rs.c | 6 |
1 files changed, 2 insertions, 4 deletions
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, | |||
| 1289 | if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported) | 1289 | if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported) |
| 1290 | return -1; | 1290 | return -1; |
| 1291 | 1291 | ||
| 1292 | if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2) | 1292 | if (sta->smps_mode == IEEE80211_SMPS_STATIC) |
| 1293 | == WLAN_HT_CAP_SM_PS_STATIC) | ||
| 1294 | return -1; | 1293 | return -1; |
| 1295 | 1294 | ||
| 1296 | /* Need both Tx chains/antennas to support MIMO */ | 1295 | /* Need both Tx chains/antennas to support MIMO */ |
| @@ -1345,8 +1344,7 @@ static int rs_switch_to_mimo3(struct iwl_priv *priv, | |||
| 1345 | if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported) | 1344 | if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported) |
| 1346 | return -1; | 1345 | return -1; |
| 1347 | 1346 | ||
| 1348 | if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2) | 1347 | if (sta->smps_mode == IEEE80211_SMPS_STATIC) |
| 1349 | == WLAN_HT_CAP_SM_PS_STATIC) | ||
| 1350 | return -1; | 1348 | return -1; |
| 1351 | 1349 | ||
| 1352 | /* Need both Tx chains/antennas to support MIMO */ | 1350 | /* Need both Tx chains/antennas to support MIMO */ |