rt2x00: Store queue idx and entry idx in data_ring and data_entry

Store the queue idx inside structure data_ring
Store the entry idx inside structure data_entry
This saves us a few calls to ARRAY_INDEX() which is now unused.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00ring.h b/drivers/net/wireless/rt2x00/rt2x00ring.h
index 5b32f3ef2a73..e9a564863127 100644
--- a/drivers/net/wireless/rt2x00/rt2x00ring.h
+++ b/drivers/net/wireless/rt2x00/rt2x00ring.h
@@ -143,6 +143,11 @@ struct data_entry {
          */
         void *data_addr;
         dma_addr_t data_dma;
+
+        /*
+         * Entry identification number (index).
+         */
+        unsigned int entry_idx;
 };
 
 /*
@@ -181,6 +186,13 @@ struct data_ring {
         void *data_addr;
 
         /*
+         * Queue identification number:
+         * RX: 0
+         * TX: IEEE80211_TX_*
+         */
+        unsigned int queue_idx;
+
+        /*
          * Index variables.
          */
         u16 index;