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, 4 insertions, 0 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index a771a092434b..9b2bd9176467 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -988,6 +988,7 @@ static int rt2x00lib_alloc_entries(struct data_ring *ring,
                 entry[i].flags = 0;
                 entry[i].ring = ring;
                 entry[i].skb = NULL;
+                entry[i].entry_idx = i;
         }
 
         ring->entry = entry;
@@ -1115,6 +1116,7 @@ exit:
 static int rt2x00lib_alloc_rings(struct rt2x00_dev *rt2x00dev)
 {
         struct data_ring *ring;
+        unsigned int index;
 
         /*
          * We need the following rings:
@@ -1145,8 +1147,10 @@ static int rt2x00lib_alloc_rings(struct rt2x00_dev *rt2x00dev)
          * cw_min: 2^5 = 32.
          * cw_max: 2^10 = 1024.
          */
+        index = 0;
         ring_for_each(rt2x00dev, ring) {
                 ring->rt2x00dev = rt2x00dev;
+                ring->queue_idx = index++;
                 ring->tx_params.aifs = 2;
                 ring->tx_params.cw_min = 5;
                 ring->tx_params.cw_max = 10;