aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-tx.c
diff options
context:
space:
mode:
authorSamuel Ortiz <samuel.ortiz@intel.com>2009-01-23 16:45:13 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:01:33 -0500
commit59606ffa9146538b73bbe1ca1285321cd7474bc0 (patch)
treef54644b3c64b6f9734891547a6f670cbb3fb3ec5 /drivers/net/wireless/iwlwifi/iwl-tx.c
parent77fecfb88f8ad64420e06a96f1bd3b38498bfb4f (diff)
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-tx.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-tx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 1a2cfbebb17b..83e9f32cbd8e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -295,12 +295,12 @@ static int iwl_tx_queue_alloc(struct iwl_priv *priv,
295 /* Circular buffer of transmit frame descriptors (TFDs), 295 /* Circular buffer of transmit frame descriptors (TFDs),
296 * shared with device */ 296 * shared with device */
297 txq->tfds = pci_alloc_consistent(dev, 297 txq->tfds = pci_alloc_consistent(dev,
298 sizeof(txq->tfds[0]) * TFD_QUEUE_SIZE_MAX, 298 sizeof(struct iwl_tfd) * TFD_QUEUE_SIZE_MAX,
299 &txq->q.dma_addr); 299 &txq->q.dma_addr);
300 300
301 if (!txq->tfds) { 301 if (!txq->tfds) {
302 IWL_ERR(priv, "pci_alloc_consistent(%zd) failed\n", 302 IWL_ERR(priv, "pci_alloc_consistent(%zd) failed\n",
303 sizeof(txq->tfds[0]) * TFD_QUEUE_SIZE_MAX); 303 sizeof(struct iwl_tfd) * TFD_QUEUE_SIZE_MAX);
304 goto error; 304 goto error;
305 } 305 }
306 txq->q.id = id; 306 txq->q.id = id;