aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-15 14:28:46 -0700
committerDavid S. Miller <davem@davemloft.net>2010-04-15 14:28:46 -0700
commit334656f33c43921cf383dfd0220dfd34376bcd98 (patch)
tree36fe8c7959cd58cbf5865fcd3f9994f8875e17fc
parente30b38c298b55e09456d3ccbc1df2f3e2e8dc6e9 (diff)
parent8b9fce77737ae9983f61ec56cd53f52fb738b2c7 (diff)
downloadmrst-s0i3-test-334656f33c43921cf383dfd0220dfd34376bcd98.tar.gz
mrst-s0i3-test-334656f33c43921cf383dfd0220dfd34376bcd98.tar.xz
mrst-s0i3-test-334656f33c43921cf383dfd0220dfd34376bcd98.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-calib.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.c b/drivers/net/wireless/iwlwifi/iwl-calib.c
index de3b3f403d1..8b516c5ff0b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-calib.c
@@ -808,6 +808,18 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
}
}
+ /*
+ * The above algorithm sometimes fails when the ucode
+ * reports 0 for all chains. It's not clear why that
+ * happens to start with, but it is then causing trouble
+ * because this can make us enable more chains than the
+ * hardware really has.
+ *
+ * To be safe, simply mask out any chains that we know
+ * are not on the device.
+ */
+ active_chains &= priv->hw_params.valid_rx_ant;
+
num_tx_chains = 0;
for (i = 0; i < NUM_RX_CHAINS; i++) {
/* loops on all the bits of