aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/fw.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2013-01-17 02:42:25 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-03-06 10:47:58 -0500
commit931d416049cdb6e8382792231317f76be0d922ce (patch)
treedd34fee8764e451bdd16c2be20b3dcfa19497bc3 /drivers/net/wireless/iwlwifi/mvm/fw.c
parentfb3ceb817503f3d89e3beb4f48a2f4d608a6697f (diff)
iwlwifi: mvm: begin basic BT-Coex implementation
Send the PRIO table before the calibrations. This table tells the fw what priority to give to what (WiFi / BT) according to events. Send a hardcoded BT_COEX command to the fw to enable basic BT coexistence. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/fw.c')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/fw.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/iwlwifi/mvm/fw.c
index 0f45fa583aa1..1006b3204e7b 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/iwlwifi/mvm/fw.c
@@ -309,6 +309,10 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)
309 goto error; 309 goto error;
310 } 310 }
311 311
312 ret = iwl_send_bt_prio_tbl(mvm);
313 if (ret)
314 goto error;
315
312 if (read_nvm) { 316 if (read_nvm) {
313 /* Read nvm */ 317 /* Read nvm */
314 ret = iwl_nvm_init(mvm); 318 ret = iwl_nvm_init(mvm);
@@ -414,6 +418,14 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
414 if (ret) 418 if (ret)
415 goto error; 419 goto error;
416 420
421 ret = iwl_send_bt_prio_tbl(mvm);
422 if (ret)
423 goto error;
424
425 ret = iwl_send_bt_init_conf(mvm);
426 if (ret)
427 goto error;
428
417 /* Send phy db control command and then phy db calibration*/ 429 /* Send phy db control command and then phy db calibration*/
418 ret = iwl_send_phy_db_data(mvm->phy_db); 430 ret = iwl_send_phy_db_data(mvm->phy_db);
419 if (ret) 431 if (ret)