diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-11-06 17:52:56 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-11 15:23:45 -0500 |
commit | 6762f07fd55ff5e588aa5f0a1b70efe8e268a2e8 (patch) | |
tree | b5307b6352103216ac0f11d129aa707a8a5b98c2 /drivers/net/wireless | |
parent | 740e7f51c226076d8f8ccb203d9ba6258a5bcec7 (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/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 6 |
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 e0edc607e33f..d09e74815323 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, | |||
2316 | >> IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT; | 2316 | >> IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT; |
2317 | maxstreams += 1; | 2317 | maxstreams += 1; |
2318 | 2318 | ||
2319 | ht_conf->sm_ps = | ||
2320 | (u8)((ht_cap->cap & IEEE80211_HT_CAP_SM_PS) | ||
2321 | >> 2); | ||
2322 | IWL_DEBUG_MAC80211(priv, "sm_ps: 0x%x\n", | ||
2323 | ht_conf->sm_ps); | ||
2324 | |||
2325 | if ((ht_cap->mcs.rx_mask[1] == 0) && | 2319 | if ((ht_cap->mcs.rx_mask[1] == 0) && |
2326 | (ht_cap->mcs.rx_mask[2] == 0)) | 2320 | (ht_cap->mcs.rx_mask[2] == 0)) |
2327 | ht_conf->single_chain_sufficient = true; | 2321 | ht_conf->single_chain_sufficient = true; |