diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2008-09-02 23:26:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-09-11 15:53:31 -0400 |
| commit | 00c5ae2fa0f8191a1b204e71f0ee11359e3b2c06 (patch) | |
| tree | 06ebdd29be276ef829e270497781db43783a8710 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | 1e493d1946a0b26b79001c18d7312d536156ff5a (diff) | |
mac80211: change MIMO_PS to SM_PS
This patch follows 11n spec naming more rigorously replacing MIMO_PS
with SM_PS (Spatial Multiplexing Power Save).
(Originally submitted as 4 patches, "mac80211: change MIMO_PS to SM_PS",
"iwlwifi: change MIMO_PS to SM_PS", "ath9k: change MIMO_PS to SM_PS",
and "iwlwifi: remove double definition of SM PS". -- JWL)
Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 1547122e66fa..27ddf6cb1c6e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -564,7 +564,7 @@ static void iwl4965_ht_conf(struct iwl_priv *priv, | |||
| 564 | if (!iwl_conf->is_ht) | 564 | if (!iwl_conf->is_ht) |
| 565 | return; | 565 | return; |
| 566 | 566 | ||
| 567 | priv->ps_mode = (u8)((ht_conf->cap & IEEE80211_HT_CAP_MIMO_PS) >> 2); | 567 | priv->ps_mode = (u8)((ht_conf->cap & IEEE80211_HT_CAP_SM_PS) >> 2); |
| 568 | 568 | ||
| 569 | if (ht_conf->cap & IEEE80211_HT_CAP_SGI_20) | 569 | if (ht_conf->cap & IEEE80211_HT_CAP_SGI_20) |
| 570 | iwl_conf->sgf |= HT_SHORT_GI_20MHZ; | 570 | iwl_conf->sgf |= HT_SHORT_GI_20MHZ; |