Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 091ed315 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

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: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 871ff6ed

drivers/net/wireless/rt2x00/rt2x00dev.c

+1 −11
Original line number Diff line number Diff line
@@ -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.

	 */