summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-3945.c
diff options
context:
space:
mode:
authorSamuel Ortiz2009-01-23 22:45:13 +0100
committerJohn W. Linville2009-01-29 22:01:33 +0100
commit59606ffa9146538b73bbe1ca1285321cd7474bc0 (patch)
treef54644b3c64b6f9734891547a6f670cbb3fb3ec5 /drivers/net/wireless/iwlwifi/iwl-3945.c
parentiwl3945: Use iwlcore scan code (diff)
downloadkernel-qcow2-linux-59606ffa9146538b73bbe1ca1285321cd7474bc0.tar.gz
kernel-qcow2-linux-59606ffa9146538b73bbe1ca1285321cd7474bc0.tar.xz
kernel-qcow2-linux-59606ffa9146538b73bbe1ca1285321cd7474bc0.zip
iwlwifi: make iwl_tx_queue->tfds void*
Instead of having both tfds and tfds39, we can just have a void *tfds. It makes the tx_queue structure nicer, and the code cleaner. It also helps with further TX queues management code merging. Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 602a3a915684..22770f44c2fa 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -730,10 +730,11 @@ int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,
{
int count;
struct iwl_queue *q;
- struct iwl3945_tfd *tfd;
+ struct iwl3945_tfd *tfd, *tfd_tmp;
q = &txq->q;
- tfd = &txq->tfds39[q->write_ptr];
+ tfd_tmp = (struct iwl3945_tfd *)txq->tfds;
+ tfd = &tfd_tmp[q->write_ptr];
if (reset)
memset(tfd, 0, sizeof(*tfd));
@@ -764,7 +765,7 @@ int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,
*/
void iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)
{
- struct iwl3945_tfd *tfd_tmp = (struct iwl3945_tfd *)&txq->tfds39[0];
+ struct iwl3945_tfd *tfd_tmp = (struct iwl3945_tfd *)txq->tfds;
struct iwl3945_tfd *tfd = &tfd_tmp[txq->q.read_ptr];
struct pci_dev *dev = priv->pci_dev;
int i;