aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211/wme.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-06-22 10:06:59 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-06-27 15:09:39 -0400
commit04b7dcf979d71e870683c804802e44287a802760 (patch)
tree41eed581c3e99d2de254aebe8d68e63c427aea62 /net/mac80211/wme.h
parente913d468308be1cce7cc8e6e6e997d54a403ce64 (diff)
wireless: unify QoS control field definitions
Move all that mac80211 has into the generic ieee80211.h header file and use them. At the same time move them from mask+shift to just bits and rename them for consistent names. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wme.h')
-rw-r--r--net/mac80211/wme.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h
index 6053b1c9fee..faead6d0202 100644
--- a/net/mac80211/wme.h
+++ b/net/mac80211/wme.h
@@ -13,11 +13,6 @@
#include <linux/netdevice.h>
#include "ieee80211_i.h"
-#define QOS_CONTROL_ACK_POLICY_NORMAL 0
-#define QOS_CONTROL_ACK_POLICY_NOACK 1
-
-#define QOS_CONTROL_ACK_POLICY_SHIFT 5
-
extern const int ieee802_1d_to_ac[8];
u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,