From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
ipw3945-devel@lists.sourceforge.net,
Johannes Berg <johannes.berg@intel.com>,
Wey-Yi Guy <wey-yi.w.guy@intel.com>
Subject: [PATCH 06/18] iwlagn: fix some naming regarding FIFOs
Date: Tue, 16 Nov 2010 08:01:39 -0800 [thread overview]
Message-ID: <1289923311-14920-7-git-send-email-wey-yi.w.guy@intel.com> (raw)
In-Reply-To: <1289923311-14920-1-git-send-email-wey-yi.w.guy@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
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>
---
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 7036211..8b129e2 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)
int iwlagn_alive_notify(struct iwl_priv *priv)
{
- const s8 *queues;
+ const s8 *queue_to_fifo;
u32 a;
unsigned long flags;
int i, chan;
@@ -492,9 +492,9 @@ int iwlagn_alive_notify(struct iwl_priv *priv)
/* map queues to FIFOs */
if (priv->valid_contexts != BIT(IWL_RXON_CTX_BSS))
- queues = iwlagn_ipan_queue_to_tx_fifo;
+ queue_to_fifo = iwlagn_ipan_queue_to_tx_fifo;
else
- queues = iwlagn_default_queue_to_tx_fifo;
+ queue_to_fifo = iwlagn_default_queue_to_tx_fifo;
iwlagn_set_wr_ptrs(priv, priv->cmd_queue, 0);
@@ -510,14 +510,14 @@ int iwlagn_alive_notify(struct iwl_priv *priv)
BUILD_BUG_ON(ARRAY_SIZE(iwlagn_ipan_queue_to_tx_fifo) != 10);
for (i = 0; i < 10; i++) {
- int ac = queues[i];
+ int fifo = queue_to_fifo[i];
iwl_txq_ctx_activate(priv, i);
- if (ac == IWL_TX_FIFO_UNUSED)
+ if (fifo == IWL_TX_FIFO_UNUSED)
continue;
- iwlagn_tx_queue_set_status(priv, &priv->txq[i], ac, 0);
+ iwlagn_tx_queue_set_status(priv, &priv->txq[i], fifo, 0);
}
spin_unlock_irqrestore(&priv->lock, flags);
--
1.7.0.4
next prev parent reply other threads:[~2010-11-16 16:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-16 16:01 [PATCH 00/18] update for 2.6.38 Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 01/18] iwlagn: used frame count info in compressed ba packet Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 02/18] iwlagn: set dynamic aggregation threshold for BT Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 03/18] iwlagn: support dynamic aggregation for BT coex Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 04/18] iwlagn: change default ACK/CTS MASK setting for WiFi/BT coex Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 05/18] iwlwifi: change default led mode for different devices Wey-Yi Guy
2010-11-16 16:01 ` Wey-Yi Guy [this message]
2010-11-16 16:01 ` [PATCH 07/18] iwlagn: remove unused variable swq_id Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 08/18] iwlagn: remove a bogus AGG_OFF check Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 09/18] iwlwifi: pass txq to wake/stop queue Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 10/18] iwlwifi: always build swq_id as virtual queue ID Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 11/18] iwlagn: fix PAN queues Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 12/18] iwlagn: avoid crash if vif is not assigned Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 13/18] iwlagn: reprogram AP STA after assoc Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 14/18] iwlagn: fix PAN slot timing wrt. DTIM Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 15/18] iwlagn: update QoS before commit associated RXON Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 16/18] iwlagn: use SKU information in the EEPROM Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 17/18] iwlagn: check change before commit RXON cmd Wey-Yi Guy
2010-11-16 16:01 ` [PATCH 18/18] iwlwifi: set STATUS_READY before commit_rxon Wey-Yi Guy
2010-11-16 21:02 ` [PATCH 00/18] update for 2.6.38 John W. Linville
2010-11-16 21:24 ` Rafał Miłecki
2010-11-16 21:39 ` Guy, Wey-Yi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1289923311-14920-7-git-send-email-wey-yi.w.guy@intel.com \
--to=wey-yi.w.guy@intel.com \
--cc=ipw3945-devel@lists.sourceforge.net \
--cc=johannes.berg@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).