|
 |
deb259 |
From 3335a827ae30b9575209c9c06e5086239da6fcd0 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 25 Jul 2019 19:33:04 +0200
|
|
|
deb259 |
Subject: [PATCH 5/7] Revert "iwlwifi: mvm: stop static queues correctly"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit 99944b73069d8bcea573c07df8dc8d4f33e78586.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 15 ---------------
|
|
|
deb259 |
1 file changed, 15 deletions(-)
|
|
|
deb259 |
|
|
|
deb259 |
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
|
|
|
deb259 |
index dfc94882316c..41fc17807a43 100644
|
|
|
deb259 |
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
|
|
|
deb259 |
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
|
|
|
deb259 |
@@ -1103,12 +1103,6 @@ static void iwl_mvm_async_cb(struct iwl_op_mode *op_mode,
|
|
|
deb259 |
iwl_trans_block_txq_ptrs(mvm->trans, false);
|
|
|
deb259 |
}
|
|
|
deb259 |
|
|
|
deb259 |
-static int iwl_mvm_is_static_queue(struct iwl_mvm *mvm, int queue)
|
|
|
deb259 |
-{
|
|
|
deb259 |
- return queue == mvm->aux_queue || queue == mvm->probe_queue ||
|
|
|
deb259 |
- queue == mvm->p2p_dev_queue || queue == mvm->snif_queue;
|
|
|
deb259 |
-}
|
|
|
deb259 |
-
|
|
|
deb259 |
static void iwl_mvm_queue_state_change(struct iwl_op_mode *op_mode,
|
|
|
deb259 |
int hw_queue, bool start)
|
|
|
deb259 |
{
|
|
|
deb259 |
@@ -1135,15 +1129,6 @@ static void iwl_mvm_queue_state_change(struct iwl_op_mode *op_mode,
|
|
|
deb259 |
goto out;
|
|
|
deb259 |
mvmsta = iwl_mvm_sta_from_mac80211(sta);
|
|
|
deb259 |
|
|
|
deb259 |
- if (iwl_mvm_is_static_queue(mvm, hw_queue)) {
|
|
|
deb259 |
- if (!start)
|
|
|
deb259 |
- ieee80211_stop_queues(mvm->hw);
|
|
|
deb259 |
- else if (mvmsta->sta_state != IEEE80211_STA_NOTEXIST)
|
|
|
deb259 |
- ieee80211_wake_queues(mvm->hw);
|
|
|
deb259 |
-
|
|
|
deb259 |
- goto out;
|
|
|
deb259 |
- }
|
|
|
deb259 |
-
|
|
|
deb259 |
if (iwl_mvm_has_new_tx_api(mvm)) {
|
|
|
deb259 |
int tid = mvm->tvqm_info[hw_queue].txq_tid;
|
|
|
deb259 |
|
|
|
deb259 |
--
|
|
|
deb259 |
2.13.6
|
|
|
deb259 |
|