diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-08-23 07:57:05 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-25 14:34:19 -0400 |
| commit | aeb4a2eec2b1d2ac6507e9cec2aecc46fdba8741 (patch) | |
| tree | 9a54c2916234a95a90eeb03ecdda2d05901b4b57 /drivers/net/wireless/iwlwifi/iwl-6000.c | |
| parent | bee008b78307ccc2e17c7ec152dd2098d5f2e1fa (diff) | |
| download | blackbird-op-linux-aeb4a2eec2b1d2ac6507e9cec2aecc46fdba8741.tar.gz blackbird-op-linux-aeb4a2eec2b1d2ac6507e9cec2aecc46fdba8741.zip | |
iwlagn: wifi/bt coex configuration sequence
bt config command need to send before the init calibration command,
driver need to let uCode know that calibrations are being performed now
in order to assure antenna is not being taken to BT use during radio/dsp
reads/writes
Also, bt_coex_priorty_table command need to be send right after the
bt_config_command during init sequence. Followed by bt coex envelope
command to initialize and prepare uCode bt state machine
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index a4601b58a5db..101630b80c40 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c @@ -235,11 +235,10 @@ static void iwl6000g2b_send_bt_config(struct iwl_priv *priv) /* * Configure BT coex mode to "no coexistence" when the * user disabled BT coexistence, we have no interface - * (might be in monitor mode), or the interface is in + * user disabled BT coexistence, or the interface is in * IBSS mode (no proper uCode support for coex then). */ - if (!bt_coex_active || !priv->vif || - priv->iw_mode == NL80211_IFTYPE_ADHOC) { + if (!bt_coex_active || priv->iw_mode == NL80211_IFTYPE_ADHOC) { bt_cmd.flags = 0; } else { bt_cmd.flags = IWL6000G2B_BT_FLAG_CHANNEL_INHIBITION | |
