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/iwlwifi/iwl4965-base.c | |
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/iwlwifi/iwl4965-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 5363be7a305e..4406fc72d881 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -6339,7 +6339,7 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
6339 | return ret; | 6339 | return ret; |
6340 | } | 6340 | } |
6341 | 6341 | ||
6342 | static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, int queue, | 6342 | static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, u16 queue, |
6343 | const struct ieee80211_tx_queue_params *params) | 6343 | const struct ieee80211_tx_queue_params *params) |
6344 | { | 6344 | { |
6345 | struct iwl_priv *priv = hw->priv; | 6345 | struct iwl_priv *priv = hw->priv; |