This is now rebased to wireless-next and includes a fixup for a merge issue of the crypto series and Bob's reordering patch. I hope you don't mind - I will be gone for the next week, so I need to push this out now. The following series adds WME QoS for ath5k by using four hardware queues and adding the necessary callback function for mac80211 to configure the queue parameters. Unfortunately, if we use multiple queues, the hardware can get stuck, and we don't know a better solution than resetting the hardware in this case. This is the same situation as in ath9k and i have copied the workaround from there. bruno --- Bob Copeland (1): This change reorganizes the main ath5k file in order to re-group Bruno Randolf (10): ath/ath5k/ath9k: Fix crypto capabilities merge issue ath5k: Use four hardware queues ath5k: Fix queue debug file ath5k: Fix TX queues stopping ath5k: Move tx frame completion into separate function ath5k: Add watchdog for stuck TX queues ath5k: Count how many times a queue got stuck ath5k: Keep last descriptor in queue ath5k: Simplify cw_min/max and AIFS configuration ath5k: Add tx queue configuration function drivers/net/wireless/ath/ath.h | 9 drivers/net/wireless/ath/ath5k/ath5k.h | 13 drivers/net/wireless/ath/ath5k/attach.c | 5 drivers/net/wireless/ath/ath5k/base.c | 1972 ++++++++++++++++--------------- drivers/net/wireless/ath/ath5k/base.h | 9 drivers/net/wireless/ath/ath5k/debug.c | 11 drivers/net/wireless/ath/ath5k/qcu.c | 99 +- drivers/net/wireless/ath/ath9k/hw.c | 2 8 files changed, 1065 insertions(+), 1055 deletions(-) -- Signature -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html