aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2009-11-06 14:52:56 -0800
committerJohn W. Linville <linville@tuxdriver.com>2009-11-11 15:23:45 -0500
commit6762f07fd55ff5e588aa5f0a1b70efe8e268a2e8 (patch)
treeb5307b6352103216ac0f11d129aa707a8a5b98c2 /drivers
parent740e7f51c226076d8f8ccb203d9ba6258a5bcec7 (diff)
iwlwifi: do not base station's sm_ps setting on AP
Do not use AP's SM_PS setting for our own SM_PS setting. Reported-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index e0edc607e33..d09e7481532 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2316,12 +2316,6 @@ static void iwl_ht_conf(struct iwl_priv *priv,
>> IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT;
maxstreams += 1;
- ht_conf->sm_ps =
- (u8)((ht_cap->cap & IEEE80211_HT_CAP_SM_PS)
- >> 2);
- IWL_DEBUG_MAC80211(priv, "sm_ps: 0x%x\n",
- ht_conf->sm_ps);
-
if ((ht_cap->mcs.rx_mask[1] == 0) &&
(ht_cap->mcs.rx_mask[2] == 0))
ht_conf->single_chain_sufficient = true;