ath9k: remove duplicate WMM AC definitions

[deliverable/linux.git] / drivers / net / wireless / ath / ath9k / mac.h

diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h
index 3c65c91b049beabe15255b33b961c6414e5e8aa2..7559fb2b28a5b6541c25700a51bc585d8c68b0f2 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/mac.h
+++ b/drivers/net/wireless/ath/ath9k/mac.h
@@ -577,13 +577,8 @@ enum ath9k_tx_queue {
 
 #define        ATH9K_NUM_TX_QUEUES 10
 
-enum ath9k_tx_queue_subtype {
-       ATH9K_WME_AC_BK = 0,
-       ATH9K_WME_AC_BE,
-       ATH9K_WME_AC_VI,
-       ATH9K_WME_AC_VO,
-       ATH9K_WME_UPSD
-};
+/* Used as a queue subtype instead of a WMM AC */
+#define ATH9K_WME_UPSD 4
 
 enum ath9k_tx_queue_flags {
        TXQ_FLAG_TXOKINT_ENABLE = 0x0001,
@@ -617,7 +612,7 @@ enum ath9k_pkt_type {
 struct ath9k_tx_queue_info {
        u32 tqi_ver;
        enum ath9k_tx_queue tqi_type;
-       enum ath9k_tx_queue_subtype tqi_subtype;
+       int tqi_subtype;
        enum ath9k_tx_queue_flags tqi_qflags;
        u32 tqi_priority;
        u32 tqi_aifs;