diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-12 15:38:26 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-12 15:38:26 +0300 |
| commit | 208d271a3f5388672b3d7ec141e975abd84ab3da (patch) | |
| tree | 6a181c31d00e896338b758ebda01226597953b1e /drivers/net/wireless/iwlwifi/mvm/coex.c | |
| parent | e111e9685790ccd9acce5de51fa7ed6b9ae8a746 (diff) | |
| parent | 060b4460c47143440e77e6721f68ef756674d207 (diff) | |
| download | linux-208d271a3f5388672b3d7ec141e975abd84ab3da.tar.xz | |
Merge branch 'iwlwifi-fixes' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/coex.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/coex.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/coex.c b/drivers/net/wireless/iwlwifi/mvm/coex.c index c7358a9d5b71..770b0e2a9b46 100644 --- a/drivers/net/wireless/iwlwifi/mvm/coex.c +++ b/drivers/net/wireless/iwlwifi/mvm/coex.c @@ -579,7 +579,8 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac, if (!vif->bss_conf.assoc) smps_mode = IEEE80211_SMPS_AUTOMATIC; - if (IWL_COEX_IS_RRC_ON(mvm->last_bt_notif.ttc_rrc_status, + if (mvmvif->phy_ctxt && + IWL_COEX_IS_RRC_ON(mvm->last_bt_notif.ttc_rrc_status, mvmvif->phy_ctxt->id)) smps_mode = IEEE80211_SMPS_AUTOMATIC; |