summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-05-01 17:17:30 +0200
committerJohn W. Linville <linville@tuxdriver.com>2013-05-22 15:05:30 -0400
commit98cd6c718c6e782d3b01e3fc3da00cf18c114586 (patch)
treef6dc733746119255f8db98da815dc98d98a86d99
parent54ca193310bbd33bdf8b2634b6a3115dd8665013 (diff)
downloadlinux-98cd6c718c6e782d3b01e3fc3da00cf18c114586.tar.gz
linux-98cd6c718c6e782d3b01e3fc3da00cf18c114586.tar.bz2
linux-98cd6c718c6e782d3b01e3fc3da00cf18c114586.zip
rt2x00: rt61pci: use rt2x00dev->tx->limit
The TX data queue is initialized already when the rt61pci_txdone() function is called. Fetch the number of the queue entries from that instead of using the entry_num field of the data queue descriptor. The two values are the same, and the use of the rt2x00dev->tx->limit value allows us to get rid of a superfluous pointer dereference. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt61pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 0dc8180e251b..7e1759b3e49a 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2175,7 +2175,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev)
* that the TX_STA_FIFO stack has a size of 16. We stick to our
* tx ring size for now.
*/
- for (i = 0; i < rt2x00dev->ops->tx->entry_num; i++) {
+ for (i = 0; i < rt2x00dev->tx->limit; i++) {
rt2x00mmio_register_read(rt2x00dev, STA_CSR4, &reg);
if (!rt2x00_get_field32(reg, STA_CSR4_VALID))
break;