diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-tx.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c index a51a7cfa5a14..88b7bbfb1f91 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c | |||
@@ -118,7 +118,7 @@ void iwlagn_txq_update_byte_cnt_tbl(struct iwl_priv *priv, | |||
118 | 118 | ||
119 | WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX); | 119 | WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX); |
120 | 120 | ||
121 | if (txq_id != IWL_CMD_QUEUE_NUM) { | 121 | if (txq_id != priv->cmd_queue) { |
122 | sta_id = txq->cmd[txq->q.write_ptr]->cmd.tx.sta_id; | 122 | sta_id = txq->cmd[txq->q.write_ptr]->cmd.tx.sta_id; |
123 | sec_ctl = txq->cmd[txq->q.write_ptr]->cmd.tx.sec_ctl; | 123 | sec_ctl = txq->cmd[txq->q.write_ptr]->cmd.tx.sec_ctl; |
124 | 124 | ||
@@ -155,7 +155,7 @@ void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_priv *priv, | |||
155 | 155 | ||
156 | WARN_ON(read_ptr >= TFD_QUEUE_SIZE_MAX); | 156 | WARN_ON(read_ptr >= TFD_QUEUE_SIZE_MAX); |
157 | 157 | ||
158 | if (txq_id != IWL_CMD_QUEUE_NUM) | 158 | if (txq_id != priv->cmd_queue) |
159 | sta_id = txq->cmd[read_ptr]->cmd.tx.sta_id; | 159 | sta_id = txq->cmd[read_ptr]->cmd.tx.sta_id; |
160 | 160 | ||
161 | bc_ent = cpu_to_le16(1 | (sta_id << 12)); | 161 | bc_ent = cpu_to_le16(1 | (sta_id << 12)); |
@@ -825,7 +825,7 @@ void iwlagn_hw_txq_ctx_free(struct iwl_priv *priv) | |||
825 | /* Tx queues */ | 825 | /* Tx queues */ |
826 | if (priv->txq) { | 826 | if (priv->txq) { |
827 | for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) | 827 | for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) |
828 | if (txq_id == IWL_CMD_QUEUE_NUM) | 828 | if (txq_id == priv->cmd_queue) |
829 | iwl_cmd_queue_free(priv); | 829 | iwl_cmd_queue_free(priv); |
830 | else | 830 | else |
831 | iwl_tx_queue_free(priv, txq_id); | 831 | iwl_tx_queue_free(priv, txq_id); |
@@ -882,9 +882,9 @@ int iwlagn_txq_ctx_alloc(struct iwl_priv *priv) | |||
882 | 882 | ||
883 | spin_unlock_irqrestore(&priv->lock, flags); | 883 | spin_unlock_irqrestore(&priv->lock, flags); |
884 | 884 | ||
885 | /* Alloc and init all Tx queues, including the command queue (#4) */ | 885 | /* Alloc and init all Tx queues, including the command queue (#4/#9) */ |
886 | for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) { | 886 | for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) { |
887 | slots_num = (txq_id == IWL_CMD_QUEUE_NUM) ? | 887 | slots_num = (txq_id == priv->cmd_queue) ? |
888 | TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS; | 888 | TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS; |
889 | ret = iwl_tx_queue_init(priv, &priv->txq[txq_id], slots_num, | 889 | ret = iwl_tx_queue_init(priv, &priv->txq[txq_id], slots_num, |
890 | txq_id); | 890 | txq_id); |
@@ -922,7 +922,7 @@ void iwlagn_txq_ctx_reset(struct iwl_priv *priv) | |||
922 | 922 | ||
923 | /* Alloc and init all Tx queues, including the command queue (#4) */ | 923 | /* Alloc and init all Tx queues, including the command queue (#4) */ |
924 | for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) { | 924 | for (txq_id = 0; txq_id < priv->hw_params.max_txq_num; txq_id++) { |
925 | slots_num = txq_id == IWL_CMD_QUEUE_NUM ? | 925 | slots_num = txq_id == priv->cmd_queue ? |
926 | TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS; | 926 | TFD_CMD_SLOTS : TFD_TX_CMD_SLOTS; |
927 | iwl_tx_queue_reset(priv, &priv->txq[txq_id], slots_num, txq_id); | 927 | iwl_tx_queue_reset(priv, &priv->txq[txq_id], slots_num, txq_id); |
928 | } | 928 | } |