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/iwlegacy/4965-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/iwlegacy/4965-rs.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-rs.c | 3 |
1 files changed, 1 insertions, 2 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, | |||
| 1183 | if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported) | 1183 | if (!conf_is_ht(conf) || !sta->ht_cap.ht_supported) |
| 1184 | return -1; | 1184 | return -1; |
| 1185 | 1185 | ||
| 1186 | if (((sta->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >> 2) == | 1186 | if (sta->smps_mode == IEEE80211_SMPS_STATIC) |
| 1187 | WLAN_HT_CAP_SM_PS_STATIC) | ||
| 1188 | return -1; | 1187 | return -1; |
| 1189 | 1188 | ||
| 1190 | /* Need both Tx chains/antennas to support MIMO */ | 1189 | /* Need both Tx chains/antennas to support MIMO */ |