aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSara Sharon <sara.sharon@intel.com>2016-08-18 20:14:38 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-31 05:02:14 -0600
commite1a322b9dab0280f5bd8f7e00e81d7ecee6c2b7a (patch)
tree8142e03b1bf326958118c49163757d80af07caa0
parent4dfdaf3433a8d9d5c418e8dfebe74eb0414a974d (diff)
downloadlinux-yocto-4.8-e1a322b9dab0280f5bd8f7e00e81d7ecee6c2b7a.tar.gz
linux-yocto-4.8-e1a322b9dab0280f5bd8f7e00e81d7ecee6c2b7a.tar.bz2
linux-yocto-4.8-e1a322b9dab0280f5bd8f7e00e81d7ecee6c2b7a.zip
iwlwifi: mvm: disable P2P queue on mac context release
commit 341d7eb8223bdd48bdf75729487a2de5e01623b3 upstream. AP queue is properly released, but P2P queue isn't. Fixes: commit 4c965139a3cd ("iwlwifi: mvm: support p2p device frames tx on dqa queue #2") Signed-off-by: Sara Sharon <sara.sharon@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index 69c42ce45b8a..d742d27d8de0 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -539,6 +539,11 @@ void iwl_mvm_mac_ctxt_release(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
iwl_mvm_disable_txq(mvm, IWL_MVM_OFFCHANNEL_QUEUE,
IWL_MVM_OFFCHANNEL_QUEUE,
IWL_MAX_TID_COUNT, 0);
+ else
+ iwl_mvm_disable_txq(mvm,
+ IWL_MVM_DQA_P2P_DEVICE_QUEUE,
+ vif->hw_queue[0], IWL_MAX_TID_COUNT,
+ 0);
break;
case NL80211_IFTYPE_AP: