aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/dvm/tx.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2012-05-29 06:07:30 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-06-06 07:21:19 -0400
commitd0624be65ade709ef1a4220451a474be1ad01af9 (patch)
tree81eaecd8b1e16435add9d3daf17b83b628c5e0da /drivers/net/wireless/iwlwifi/dvm/tx.c
parent559b1a257ddeac637b8bb3a2c2469aaa2bde5383 (diff)
iwlwifi: s/txq_agg_disable/txq_disable
We need to be able to enable / disable Tx queues in HW dynamically. So this function is no longer related to AGG only. It can do the job for any queue, even AC ones. Change the name to better reflect its role. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/tx.c')
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/tx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index 52f2cae080c3..494a25c2f8aa 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -599,7 +599,7 @@ turn_off:
599 * time, or we hadn't time to drain the AC queues. 599 * time, or we hadn't time to drain the AC queues.
600 */ 600 */
601 if (agg_state == IWL_AGG_ON) 601 if (agg_state == IWL_AGG_ON)
602 iwl_trans_tx_agg_disable(priv->trans, txq_id); 602 iwl_trans_txq_disable(priv->trans, txq_id);
603 else 603 else
604 IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n", 604 IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n",
605 agg_state); 605 agg_state);
@@ -755,8 +755,8 @@ static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid)
755 IWL_DEBUG_TX_QUEUES(priv, 755 IWL_DEBUG_TX_QUEUES(priv,
756 "Can continue DELBA flow ssn = next_recl =" 756 "Can continue DELBA flow ssn = next_recl ="
757 " %d", tid_data->next_reclaimed); 757 " %d", tid_data->next_reclaimed);
758 iwl_trans_tx_agg_disable(priv->trans, 758 iwl_trans_txq_disable(priv->trans,
759 tid_data->agg.txq_id); 759 tid_data->agg.txq_id);
760 iwlagn_dealloc_agg_txq(priv, tid_data->agg.txq_id); 760 iwlagn_dealloc_agg_txq(priv, tid_data->agg.txq_id);
761 tid_data->agg.state = IWL_AGG_OFF; 761 tid_data->agg.state = IWL_AGG_OFF;
762 ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid); 762 ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);