summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorSamuel Ortiz <samuel.ortiz@intel.com>2009-01-23 13:45:13 -0800
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:01:33 -0500
commit59606ffa9146538b73bbe1ca1285321cd7474bc0 (patch)
treef54644b3c64b6f9734891547a6f670cbb3fb3ec5 /drivers/net/wireless/iwlwifi/iwl-agn.c
parent77fecfb88f8ad64420e06a96f1bd3b38498bfb4f (diff)
downloadlwn-59606ffa9146538b73bbe1ca1285321cd7474bc0.tar.gz
lwn-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-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 61788a508971..4ce3d6a63d18 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -520,7 +520,7 @@ static inline u8 iwl_tfd_get_num_tbs(struct iwl_tfd *tfd)
*/
void iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)
{
- struct iwl_tfd *tfd_tmp = (struct iwl_tfd *)&txq->tfds[0];
+ struct iwl_tfd *tfd_tmp = (struct iwl_tfd *)txq->tfds;
struct iwl_tfd *tfd;
struct pci_dev *dev = priv->pci_dev;
int index = txq->q.read_ptr;
@@ -563,11 +563,12 @@ int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv,
u8 reset, u8 pad)
{
struct iwl_queue *q;
- struct iwl_tfd *tfd;
+ struct iwl_tfd *tfd, *tfd_tmp;
u32 num_tbs;
q = &txq->q;
- tfd = &txq->tfds[q->write_ptr];
+ tfd_tmp = (struct iwl_tfd *)txq->tfds;
+ tfd = &tfd_tmp[q->write_ptr];
if (reset)
memset(tfd, 0, sizeof(*tfd));