Skip to content

Commit

Permalink
rt2x00: Fix queue_idx initialization
Browse files Browse the repository at this point in the history
For TX rings the queue_idx should start at
IEEE80211_TX_QUEUE_DATA0 and for each followup
ring this index needs to be increased.

For the RX ring the queue_idx should be set
to 0. We don't need to initialize the tx_params.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Ivo van Doorn authored and David S. Miller committed Jan 28, 2008
1 parent 40561b8 commit 89539eb
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions drivers/net/wireless/rt2x00/rt2x00dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -1239,11 +1239,16 @@ static int rt2x00lib_alloc_rings(struct rt2x00_dev *rt2x00dev)

/*
* Initialize ring parameters.
* cw_min: 2^5 = 32.
* cw_max: 2^10 = 1024.
* RX: queue_idx = 0
* TX: queue_idx = IEEE80211_TX_QUEUE_DATA0 + index
* TX: cw_min: 2^5 = 32.
* TX: cw_max: 2^10 = 1024.
*/
index = 0;
ring_for_each(rt2x00dev, ring) {
rt2x00dev->rx->rt2x00dev = rt2x00dev;
rt2x00dev->rx->queue_idx = 0;

index = IEEE80211_TX_QUEUE_DATA0;
txring_for_each(rt2x00dev, ring) {
ring->rt2x00dev = rt2x00dev;
ring->queue_idx = index++;
ring->tx_params.aifs = 2;
Expand Down

0 comments on commit 89539eb

Please sign in to comment.