diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-11-10 21:25:41 -0500 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-11-16 10:44:41 -0500 |
commit | 76f379cec6df6c9c5c9dbf7377d1bbbb0bf3fd5f (patch) | |
tree | 47f6e62b613ad6ab4380b643e4976409961c6502 /drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | |
parent | 564b344c10b694d433cef5b89f8ff8ac5e33898d (diff) |
iwlagn: fix some naming regarding FIFOs
Some variables are misnamed in the FIFO setup
code, fix that.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-ucode.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c index 703621107dac..8b129e29d341 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | |||
@@ -429,7 +429,7 @@ void iwlagn_send_bt_env(struct iwl_priv *priv, u8 action, u8 type) | |||
429 | 429 | ||
430 | int iwlagn_alive_notify(struct iwl_priv *priv) | 430 | int iwlagn_alive_notify(struct iwl_priv *priv) |
431 | { | 431 | { |
432 | const s8 *queues; | 432 | const s8 *queue_to_fifo; |
433 | u32 a; | 433 | u32 a; |
434 | unsigned long flags; | 434 | unsigned long flags; |
435 | int i, chan; | 435 | int i, chan; |
@@ -492,9 +492,9 @@ int iwlagn_alive_notify(struct iwl_priv *priv) | |||
492 | 492 | ||
493 | /* map queues to FIFOs */ | 493 | /* map queues to FIFOs */ |
494 | if (priv->valid_contexts != BIT(IWL_RXON_CTX_BSS)) | 494 | if (priv->valid_contexts != BIT(IWL_RXON_CTX_BSS)) |
495 | queues = iwlagn_ipan_queue_to_tx_fifo; | 495 | queue_to_fifo = iwlagn_ipan_queue_to_tx_fifo; |
496 | else | 496 | else |
497 | queues = iwlagn_default_queue_to_tx_fifo; | 497 | queue_to_fifo = iwlagn_default_queue_to_tx_fifo; |
498 | 498 | ||
499 | iwlagn_set_wr_ptrs(priv, priv->cmd_queue, 0); | 499 | iwlagn_set_wr_ptrs(priv, priv->cmd_queue, 0); |
500 | 500 | ||
@@ -510,14 +510,14 @@ int iwlagn_alive_notify(struct iwl_priv *priv) | |||
510 | BUILD_BUG_ON(ARRAY_SIZE(iwlagn_ipan_queue_to_tx_fifo) != 10); | 510 | BUILD_BUG_ON(ARRAY_SIZE(iwlagn_ipan_queue_to_tx_fifo) != 10); |
511 | 511 | ||
512 | for (i = 0; i < 10; i++) { | 512 | for (i = 0; i < 10; i++) { |
513 | int ac = queues[i]; | 513 | int fifo = queue_to_fifo[i]; |
514 | 514 | ||
515 | iwl_txq_ctx_activate(priv, i); | 515 | iwl_txq_ctx_activate(priv, i); |
516 | 516 | ||
517 | if (ac == IWL_TX_FIFO_UNUSED) | 517 | if (fifo == IWL_TX_FIFO_UNUSED) |
518 | continue; | 518 | continue; |
519 | 519 | ||
520 | iwlagn_tx_queue_set_status(priv, &priv->txq[i], ac, 0); | 520 | iwlagn_tx_queue_set_status(priv, &priv->txq[i], fifo, 0); |
521 | } | 521 | } |
522 | 522 | ||
523 | spin_unlock_irqrestore(&priv->lock, flags); | 523 | spin_unlock_irqrestore(&priv->lock, flags); |