aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/dvm
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-03-24 05:23:51 -0400
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-04-13 02:35:58 -0400
commit3cafdbe6ad6ff0af74cf7953737475732d34ca66 (patch)
treee0f504f16fd4a1d7e65640ce295829792efe17c2 /drivers/net/wireless/iwlwifi/dvm
parentd13c8dca67e0ae1a529978849886525f9bdbabbc (diff)
iwlwifi: allow to wait for a subset of the queues
This will be used later to flush / wait for queues that are related to a specific vif. Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm')
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/lib.c2
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/mac80211.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/lib.c b/drivers/net/wireless/iwlwifi/dvm/lib.c
index 576f7ee38ca5..d169228f59e7 100644
--- a/drivers/net/wireless/iwlwifi/dvm/lib.c
+++ b/drivers/net/wireless/iwlwifi/dvm/lib.c
@@ -180,7 +180,7 @@ void iwlagn_dev_txfifo_flush(struct iwl_priv *priv)
180 goto done; 180 goto done;
181 } 181 }
182 IWL_DEBUG_INFO(priv, "wait transmit/flush all frames\n"); 182 IWL_DEBUG_INFO(priv, "wait transmit/flush all frames\n");
183 iwl_trans_wait_tx_queue_empty(priv->trans); 183 iwl_trans_wait_tx_queue_empty(priv->trans, 0xffffffff);
184done: 184done:
185 ieee80211_wake_queues(priv->hw); 185 ieee80211_wake_queues(priv->hw);
186 mutex_unlock(&priv->mutex); 186 mutex_unlock(&priv->mutex);
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index dd55c9cf7ba8..d3abc15125d6 100644
--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -1119,7 +1119,7 @@ static void iwlagn_mac_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
1119 } 1119 }
1120 } 1120 }
1121 IWL_DEBUG_MAC80211(priv, "wait transmit/flush all frames\n"); 1121 IWL_DEBUG_MAC80211(priv, "wait transmit/flush all frames\n");
1122 iwl_trans_wait_tx_queue_empty(priv->trans); 1122 iwl_trans_wait_tx_queue_empty(priv->trans, 0xffffffff);
1123done: 1123done:
1124 mutex_unlock(&priv->mutex); 1124 mutex_unlock(&priv->mutex);
1125 IWL_DEBUG_MAC80211(priv, "leave\n"); 1125 IWL_DEBUG_MAC80211(priv, "leave\n");