]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mac80211: defines for AC numbers
authorJohannes Berg <johannes.berg@intel.com>
Tue, 16 Nov 2010 19:49:58 +0000 (11:49 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 17 Nov 2010 21:19:31 +0000 (16:19 -0500)
In many places we've just hardcoded the
AC numbers -- which is a relic from the
original mac80211 (d80211). Add constants
for them so we know what we're talking
about.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
include/net/mac80211.h
net/mac80211/wme.c

index 1248369a7c301cfbcd73e6b81c1af314b93a3349..5b0fff2178bbe72d8dcd44bf359daa859b8544d0 100644 (file)
@@ -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
  *
index 34e6d02da779f89731a33261745eea8949d14490..58e75bbc1f9132313af42f6c5d64106f0cb0cba2 100644 (file)
 /* 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)
 {