diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-11-16 11:49:58 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-17 16:19:31 -0500 |
| commit | 4bce22b9b84032c77c7e038b07b24fcc706dfc10 (patch) | |
| tree | 3c4ee91f19ca703d98956d8aa9f352df8ca10505 | |
| parent | 488f6ba75b5deaa7e89d6cdac07e0f2120899b6f (diff) | |
| download | kernel_samsung_smdk4412-4bce22b9b84032c77c7e038b07b24fcc706dfc10.zip kernel_samsung_smdk4412-4bce22b9b84032c77c7e038b07b24fcc706dfc10.tar.gz kernel_samsung_smdk4412-4bce22b9b84032c77c7e038b07b24fcc706dfc10.tar.bz2 | |
mac80211: defines for AC numbers
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>
| -rw-r--r-- | include/net/mac80211.h | 14 | ||||
| -rw-r--r-- | net/mac80211/wme.c | 11 |
2 files changed, 24 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 1248369..5b0fff2 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -97,6 +97,20 @@ enum ieee80211_max_queues { }; /** + * 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 * * The information provided in this structure is required for QoS diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index 34e6d02..58e75bb 100644 --- a/net/mac80211/wme.c +++ b/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) { |