Commit 04267104 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by David S. Miller
Browse files

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: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3867705b
......@@ -795,12 +795,6 @@ struct rt2x00_dev {
#define txringall_for_each(__dev, __entry) \
ring_loop(__entry, (__dev)->tx, ring_end(__dev))
/*
* Compute an array index from a pointer to an element and the base pointer.
*/
#define ARRAY_INDEX(__elem, __base) \
( ((char *)(__elem) - (char *)(__base)) / sizeof(*(__elem)) )
/*
* Generic RF access.
* The RF is being accessed by word index.
......
......@@ -120,12 +120,8 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
struct sk_buff *skbcopy;
struct rt2x00dump_hdr *dump_hdr;
struct timeval timestamp;
unsigned int ring_index;
unsigned int entry_index;
do_gettimeofday(&timestamp);
ring_index = ARRAY_INDEX(desc->ring, rt2x00dev->rx);
entry_index = ARRAY_INDEX(desc->entry, desc->ring->entry);
if (!test_bit(FRAME_DUMP_FILE_OPEN, &intf->frame_dump_flags))
return;
......@@ -151,8 +147,8 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
dump_hdr->chip_rf = cpu_to_le16(rt2x00dev->chip.rf);
dump_hdr->chip_rev = cpu_to_le32(rt2x00dev->chip.rev);
dump_hdr->type = cpu_to_le16(desc->frame_type);
dump_hdr->ring_index = ring_index;
dump_hdr->entry_index = entry_index;
dump_hdr->ring_index = desc->ring->queue_idx;
dump_hdr->entry_index = desc->entry->entry_idx;
dump_hdr->timestamp_sec = cpu_to_le32(timestamp.tv_sec);
dump_hdr->timestamp_usec = cpu_to_le32(timestamp.tv_usec);
......
......@@ -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;
......
......@@ -143,6 +143,11 @@ struct data_entry {
*/
void *data_addr;
dma_addr_t data_dma;
/*
* Entry identification number (index).
*/
unsigned int entry_idx;
};
/*
......@@ -180,6 +185,13 @@ struct data_ring {
dma_addr_t data_dma;
void *data_addr;
/*
* Queue identification number:
* RX: 0
* TX: IEEE80211_TX_*
*/
unsigned int queue_idx;
/*
* Index variables.
*/
......
......@@ -1031,8 +1031,10 @@ static void rt61pci_init_txring(struct rt2x00_dev *rt2x00dev, const int queue)
rt2x00_desc_write(txd, 1, word);
rt2x00_desc_read(txd, 5, &word);
rt2x00_set_field32(&word, TXD_W5_PID_TYPE, queue);
rt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE, i);
rt2x00_set_field32(&word, TXD_W5_PID_TYPE,
ring->queue_idx);
rt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE,
ring->entry[i].entry_idx);
rt2x00_desc_write(txd, 5, word);
rt2x00_desc_read(txd, 6, &word);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment