diff options
| author |   Kalle Valo <kvalo@codeaurora.org> | 2015-08-18 17:20:11 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-08-18 17:20:11 +0300 |
| commit | a6bf49db8c94d194d1c197deba2935468026ec89 (patch) | |
| tree | 45eb7b8dc6e578d5dced55a63028fc02bffbec3b /drivers/net/wireless/iwlwifi/mvm/rs.c | |
| parent | bcma: switch GPIO portions to use GPIOLIB_IRQCHIP (diff) | |
| parent | iwlwifi: mvm: fix a race in D0i3 vs. Tx path (diff) | |
| download | linux-dev-a6bf49db8c94d194d1c197deba2935468026ec89.tar.xz linux-dev-a6bf49db8c94d194d1c197deba2935468026ec89.zip | |
Merge tag 'iwlwifi-next-for-kalle-2015-08-18' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* polish the Miracast operation
* fix a few power consumption issues
* scan cleanup
* fixes for D0i3 system state
* add paging for devices that support it
* add again the new RBD allocation model
* add more options to the firmware debug system
* add support for frag SKBs in Tx
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/rs.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/rs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c index 19a79262e0a0..5ae9c8aa868f 100644 --- a/drivers/net/wireless/iwlwifi/mvm/rs.c +++ b/drivers/net/wireless/iwlwifi/mvm/rs.c @@ -177,7 +177,8 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta, mvmsta = iwl_mvm_sta_from_mac80211(sta); mvmvif = iwl_mvm_vif_from_mac80211(mvmsta->vif); - if (iwl_mvm_vif_low_latency(mvmvif) && mvmsta->vif->p2p) + if (IWL_MVM_RS_DISABLE_P2P_MIMO && + iwl_mvm_vif_low_latency(mvmvif) && mvmsta->vif->p2p) return false; if (mvm->nvm_data->sku_cap_mimo_disabled) |