diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-04-30 12:51:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-05-07 15:02:26 -0400 |
| commit | e100bb64bf7cdeae7f742a65ee1985649a7fd1b4 (patch) | |
| tree | 87ed4147c4dc583aba7c27b0717febb6fabdc76a /drivers/net/wireless/rt2x00/rt2x00queue.h | |
| parent | 36fc6757fe711def63ea3686bf6ed475d714e114 (diff) | |
mac80211: QoS related cleanups
This
* makes the queue number passed to drivers a u16
(as it will be with skb_get_queue_mapping)
* removes the useless queue number defines
* splits hw->queues into hw->queues/ampdu_queues
* removes the debugfs files for per-queue counters
* removes some dead QoS code
* removes the beacon queue configuration for IBSS
so that the drivers now never get a queue number
bigger than (hw->queues + hw->ampdu_queues - 1)
for tx and only in the range 0..hw->queues-1 for
conf_tx.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h index 29fe26525550..d1707a7ca41f 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.h +++ b/drivers/net/wireless/rt2x00/rt2x00queue.h | |||
| @@ -86,12 +86,9 @@ enum data_queue_qid { | |||
| 86 | static inline enum data_queue_qid mac80211_queue_to_qid(unsigned int queue) | 86 | static inline enum data_queue_qid mac80211_queue_to_qid(unsigned int queue) |
| 87 | { | 87 | { |
| 88 | /* Regular TX queues are mapped directly */ | 88 | /* Regular TX queues are mapped directly */ |
| 89 | if (queue < NUM_TX_DATA_QUEUES) | 89 | if (queue < 4) |
| 90 | return queue; | 90 | return queue; |
| 91 | else if (queue == IEEE80211_TX_QUEUE_BEACON) | 91 | WARN_ON(1); |
| 92 | return QID_BEACON; | ||
| 93 | else if (queue == IEEE80211_TX_QUEUE_AFTER_BEACON) | ||
| 94 | return QID_ATIM; | ||
| 95 | return QID_OTHER; | 92 | return QID_OTHER; |
| 96 | } | 93 | } |
| 97 | 94 | ||