From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
To: linux-wireless@vger.kernel.org
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
<stable@vger.kernel.org>
Subject: [PATCH 01/10] iwlwifi: mvm: fix antenna selection when BT is active
Date: Sun, 12 Jul 2015 20:08:11 +0300 [thread overview]
Message-ID: <1436720900-18588-1-git-send-email-emmanuel.grumbach@intel.com> (raw)
In-Reply-To: <1436720814.17999.2.camel@intel.com>
When BT is active, we want to avoid the shared antenna for
management frame to make sure we don't disturb BT. There
was a bug in that code because it chose the antenna
BIT(ANT_A) where ANT_A is already a bitmap (0x1). This
means that the antenna chosen in the end was ANT_B.
While this is not optimal on devices with 2 antennas (it'd
disturb BT), it is critical on single antenna devices like
3160 which couldn't connect at all when BT was active.
This fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=97181
CC: <stable@vger.kernel.org> [3.17+]
Fixes: 34c8b24ff284 ("iwlwifi: mvm: BT Coex - avoid the shared antenna for management frames")
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/tx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c
index 7ba7a118..8911686 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
@@ -252,7 +252,7 @@ void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm, struct iwl_tx_cmd *tx_cmd,
if (info->band == IEEE80211_BAND_2GHZ &&
!iwl_mvm_bt_coex_is_shared_ant_avail(mvm))
- rate_flags = BIT(mvm->cfg->non_shared_ant) << RATE_MCS_ANT_POS;
+ rate_flags = mvm->cfg->non_shared_ant << RATE_MCS_ANT_POS;
else
rate_flags =
BIT(mvm->mgmt_last_antenna_idx) << RATE_MCS_ANT_POS;
--
2.1.4
next prev parent reply other threads:[~2015-07-12 17:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-12 17:06 pull request: iwlwifi 2015-06-15 Grumbach, Emmanuel
2015-07-12 17:08 ` Emmanuel Grumbach [this message]
2015-07-12 17:08 ` [PATCH 02/10] iwlwifi: mvm: Avoid accessing Null pointer when setting igtk Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 03/10] iwlwifi: pcie: Fix bug in NIC's PM registers access Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 04/10] iwlwifi: pcie: don't panic if pcie transport alloc fails Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 05/10] iwlwifi: pcie: prepare the device before accessing it Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 06/10] iwlwifi: mvm: check time-event vif to avoid bad deletion Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 07/10] iwlwifi: edit the 3165 series and 8000 series PCI IDs Emmanuel Grumbach
2015-07-17 8:15 ` Kalle Valo
2015-07-12 17:08 ` [PATCH 08/10] iwlwifi: mvm: Add preemptive flag to scheulded scan Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 09/10] Revert "iwlwifi: pcie: New RBD allocation model" Emmanuel Grumbach
2015-07-12 17:08 ` [PATCH 10/10] iwlwifi: nvm: remove mac address byte swapping in 8000 family Emmanuel Grumbach
2015-07-17 8:26 ` pull request: iwlwifi 2015-06-15 Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436720900-18588-1-git-send-email-emmanuel.grumbach@intel.com \
--to=emmanuel.grumbach@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).