From: Ivo van Doorn Date: Sun, 3 Feb 2008 14:52:21 +0000 (+0100) Subject: rt2x00: Initialize QID from queue->qid X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=091ed315ef77a4949a6ce22e43af15a504ada348;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git rt2x00: Initialize QID from queue->qid The QID_MGMT is assigned to the beacon and atim queue during initialization. This means we don't need a seperate check in write_tx_desc().. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 014c307c270c..1bc8c14e6aec 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -628,21 +628,11 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev, memset(&txdesc, 0, sizeof(txdesc)); + txdesc.queue = skbdesc->entry->queue->qid; txdesc.cw_min = skbdesc->entry->queue->cw_min; txdesc.cw_max = skbdesc->entry->queue->cw_max; txdesc.aifs = skbdesc->entry->queue->aifs; - /* - * Identify queue - */ - if (control->queue < rt2x00dev->hw->queues) - txdesc.queue = control->queue; - else if (control->queue == IEEE80211_TX_QUEUE_BEACON || - control->queue == IEEE80211_TX_QUEUE_AFTER_BEACON) - txdesc.queue = QID_MGMT; - else - txdesc.queue = QID_OTHER; - /* * Read required fields from ieee80211 header. */