diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2007-10-25 05:15:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:03:08 -0500 |
commit | fc4b6853fb5e729616159d4f17785f089227a8e8 (patch) | |
tree | a054bb23d3a21c70bd62f48799832418246a37ca /drivers/net/wireless/iwlwifi/iwl-3945.c | |
parent | 91e1747384b80813c2a6c7a9d2dd99722d5b9e1e (diff) |
iwlwifi: renaming last_used and first_empty
This patch renames queue pointers to write_ptr and read_ptr
instead of first_empty and last_used. This is closer to technical
terminology we everyday use
Signed-off-by: Tomas Winkler <tomas.winkler@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.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index d6112816bad..b8d43436d35 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -526,14 +526,14 @@ int iwl_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *ptr, | |||
526 | } | 526 | } |
527 | 527 | ||
528 | /** | 528 | /** |
529 | * iwl_hw_txq_free_tfd - Free one TFD, those at index [txq->q.last_used] | 529 | * iwl_hw_txq_free_tfd - Free one TFD, those at index [txq->q.read_ptr] |
530 | * | 530 | * |
531 | * Does NOT advance any indexes | 531 | * Does NOT advance any indexes |
532 | */ | 532 | */ |
533 | int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq) | 533 | int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq) |
534 | { | 534 | { |
535 | struct iwl_tfd_frame *bd_tmp = (struct iwl_tfd_frame *)&txq->bd[0]; | 535 | struct iwl_tfd_frame *bd_tmp = (struct iwl_tfd_frame *)&txq->bd[0]; |
536 | struct iwl_tfd_frame *bd = &bd_tmp[txq->q.last_used]; | 536 | struct iwl_tfd_frame *bd = &bd_tmp[txq->q.read_ptr]; |
537 | struct pci_dev *dev = priv->pci_dev; | 537 | struct pci_dev *dev = priv->pci_dev; |
538 | int i; | 538 | int i; |
539 | int counter; | 539 | int counter; |
@@ -556,12 +556,12 @@ int iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq) | |||
556 | for (i = 1; i < counter; i++) { | 556 | for (i = 1; i < counter; i++) { |
557 | pci_unmap_single(dev, le32_to_cpu(bd->pa[i].addr), | 557 | pci_unmap_single(dev, le32_to_cpu(bd->pa[i].addr), |
558 | le32_to_cpu(bd->pa[i].len), PCI_DMA_TODEVICE); | 558 | le32_to_cpu(bd->pa[i].len), PCI_DMA_TODEVICE); |
559 | if (txq->txb[txq->q.last_used].skb[0]) { | 559 | if (txq->txb[txq->q.read_ptr].skb[0]) { |
560 | struct sk_buff *skb = txq->txb[txq->q.last_used].skb[0]; | 560 | struct sk_buff *skb = txq->txb[txq->q.read_ptr].skb[0]; |
561 | if (txq->txb[txq->q.last_used].skb[0]) { | 561 | if (txq->txb[txq->q.read_ptr].skb[0]) { |
562 | /* Can be called from interrupt context */ | 562 | /* Can be called from interrupt context */ |
563 | dev_kfree_skb_any(skb); | 563 | dev_kfree_skb_any(skb); |
564 | txq->txb[txq->q.last_used].skb[0] = NULL; | 564 | txq->txb[txq->q.read_ptr].skb[0] = NULL; |
565 | } | 565 | } |
566 | } | 566 | } |
567 | } | 567 | } |