diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-08-23 10:57:03 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-08-25 14:33:23 -0400 |
commit | bd6e2d579949aede258c673caf4b1eb39b95e172 (patch) | |
tree | b655d6c4b25b92e7847ae091b721da3943d1eaca | |
parent | 74e5c41bafb07f73d8445dcf5a6a968a717d3daa (diff) |
iwlwifi: use antenna A only under high BT load
When bluetooth indicated high load, we should use
only antenna A in 2.4 GHz for management frames.
Add this condition to iwl_toggle_tx_ant() to make
sure it'll always be met. Note that scanning has
a separate way of forcing the antenna, because we
should scan on antenna A only regardless of BT
traffic load.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 72eda7e8a00d..5e8fc720c570 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -147,6 +147,10 @@ u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant, u8 valid) | |||
147 | int i; | 147 | int i; |
148 | u8 ind = ant; | 148 | u8 ind = ant; |
149 | 149 | ||
150 | if (priv->band == IEEE80211_BAND_2GHZ && | ||
151 | priv->bt_traffic_load >= IWL_BT_COEX_TRAFFIC_LOAD_HIGH) | ||
152 | return 0; | ||
153 | |||
150 | for (i = 0; i < RATE_ANT_NUM - 1; i++) { | 154 | for (i = 0; i < RATE_ANT_NUM - 1; i++) { |
151 | ind = (ind + 1) < RATE_ANT_NUM ? ind + 1 : 0; | 155 | ind = (ind + 1) < RATE_ANT_NUM ? ind + 1 : 0; |
152 | if (valid & BIT(ind)) | 156 | if (valid & BIT(ind)) |