---

yaml
---
r: 89860
b: refs/heads/master
c: 091ed31
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 871ff6ed64e17a785cb4d48f56beedff038cc42a
+refs/heads/master: 091ed315ef77a4949a6ce22e43af15a504ada348

trunk/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.
 	 */