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>
This commit is contained in:
committed by
John W. Linville
parent
36fc6757fe
commit
e100bb64bf
@@ -1442,8 +1442,7 @@ static int rt2400pci_set_retry_limit(struct ieee80211_hw *hw,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int rt2400pci_conf_tx(struct ieee80211_hw *hw,
|
||||
int queue,
|
||||
static int rt2400pci_conf_tx(struct ieee80211_hw *hw, u16 queue,
|
||||
const struct ieee80211_tx_queue_params *params)
|
||||
{
|
||||
struct rt2x00_dev *rt2x00dev = hw->priv;
|
||||
@@ -1453,7 +1452,7 @@ static int rt2400pci_conf_tx(struct ieee80211_hw *hw,
|
||||
* per queue. So by default we only configure the TX queue,
|
||||
* and ignore all other configurations.
|
||||
*/
|
||||
if (queue != IEEE80211_TX_QUEUE_DATA0)
|
||||
if (queue != 0)
|
||||
return -EINVAL;
|
||||
|
||||
if (rt2x00mac_conf_tx(hw, queue, params))
|
||||
|
Reference in New Issue
Block a user