summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-02-10 22:51:41 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 21:37:21 +0100
commit8f539276ee97bd174f644fb6c18bb9965b596032 (patch)
treeb449a9c8e3a0538661c796ea485ebc56b2681acc
parentrt2x00: Fix skbdesc->data_len initialization (diff)
downloadlinux-8f539276ee97bd174f644fb6c18bb9965b596032.tar.xz
linux-8f539276ee97bd174f644fb6c18bb9965b596032.zip
rt2x00: Fix queue->qid initialization
As Adam Baker reported the queue->qid was not initialized correctly. The QID_AC_BE was assigned to the RX ring. This will move the queue initialization into a seperate function and makes sure that all queues are initialized directly with the correct qids. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00queue.c33
1 files changed, 18 insertions, 15 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 943afc9067b1..9188323f067b 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -228,6 +228,18 @@ void rt2x00queue_uninitialize(struct rt2x00_dev *rt2x00dev)
}
}
+static void rt2x00queue_init(struct rt2x00_dev *rt2x00dev,
+ struct data_queue *queue, enum data_queue_qid qid)
+{
+ spin_lock_init(&queue->lock);
+
+ queue->rt2x00dev = rt2x00dev;
+ queue->qid = qid;
+ queue->aifs = 2;
+ queue->cw_min = 5;
+ queue->cw_max = 10;
+}
+
int rt2x00queue_allocate(struct rt2x00_dev *rt2x00dev)
{
struct data_queue *queue;
@@ -265,24 +277,15 @@ int rt2x00queue_allocate(struct rt2x00_dev *rt2x00dev)
* TX: cw_max: 2^10 = 1024.
* BCN & Atim: qid = QID_MGMT
*/
- qid = QID_AC_BE;
- queue_for_each(rt2x00dev, queue) {
- spin_lock_init(&queue->lock);
+ rt2x00queue_init(rt2x00dev, rt2x00dev->rx, QID_RX);
- queue->rt2x00dev = rt2x00dev;
- queue->qid = qid++;
- queue->aifs = 2;
- queue->cw_min = 5;
- queue->cw_max = 10;
- }
+ qid = QID_AC_BE;
+ tx_queue_for_each(rt2x00dev, queue)
+ rt2x00queue_init(rt2x00dev, queue, qid++);
- /*
- * Fix non-TX data qid's
- */
- rt2x00dev->rx->qid = QID_RX;
- rt2x00dev->bcn[0].qid = QID_MGMT;
+ rt2x00queue_init(rt2x00dev, &rt2x00dev->bcn[0], QID_MGMT);
if (req_atim)
- rt2x00dev->bcn[1].qid = QID_MGMT;
+ rt2x00queue_init(rt2x00dev, &rt2x00dev->bcn[1], QID_MGMT);
return 0;
}