From 529e420562121662a1e64f2448bfe96c4d0734a1 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 16 Nov 2010 11:49:58 -0800
Subject: [PATCH] --- yaml --- r: 224614 b: refs/heads/master c:
 4bce22b9b84032c77c7e038b07b24fcc706dfc10 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/net/mac80211.h | 14 ++++++++++++++
 trunk/net/mac80211/wme.c     | 11 ++++++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e02b6b958011..32b6e4e052be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 488f6ba75b5deaa7e89d6cdac07e0f2120899b6f
+refs/heads/master: 4bce22b9b84032c77c7e038b07b24fcc706dfc10
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 1248369a7c30..5b0fff2178bb 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -96,6 +96,20 @@ enum ieee80211_max_queues {
 	IEEE80211_MAX_QUEUES =		4,
 };
 
+/**
+ * enum ieee80211_ac_numbers - AC numbers as used in mac80211
+ * @IEEE80211_AC_VO: voice
+ * @IEEE80211_AC_VI: video
+ * @IEEE80211_AC_BE: best effort
+ * @IEEE80211_AC_BK: background
+ */
+enum ieee80211_ac_numbers {
+	IEEE80211_AC_VO		= 0,
+	IEEE80211_AC_VI		= 1,
+	IEEE80211_AC_BE		= 2,
+	IEEE80211_AC_BK		= 3,
+};
+
 /**
  * struct ieee80211_tx_queue_params - transmit queue configuration
  *
diff --git a/trunk/net/mac80211/wme.c b/trunk/net/mac80211/wme.c
index 34e6d02da779..58e75bbc1f91 100644
--- a/trunk/net/mac80211/wme.c
+++ b/trunk/net/mac80211/wme.c
@@ -21,7 +21,16 @@
 /* Default mapping in classifier to work with default
  * queue setup.
  */
-const int ieee802_1d_to_ac[8] = { 2, 3, 3, 2, 1, 1, 0, 0 };
+const int ieee802_1d_to_ac[8] = {
+	IEEE80211_AC_BE,
+	IEEE80211_AC_BK,
+	IEEE80211_AC_BK,
+	IEEE80211_AC_BE,
+	IEEE80211_AC_VI,
+	IEEE80211_AC_VI,
+	IEEE80211_AC_VO,
+	IEEE80211_AC_VO
+};
 
 static int wme_downgrade_ac(struct sk_buff *skb)
 {