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>

1 files changed, 13 insertions, 5 deletions

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index bf56b6f78270..a26108e4d924 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -117,8 +117,19 @@
 #define IEEE80211_MAX_MESH_ID_LEN       32
 
 #define IEEE80211_QOS_CTL_LEN           2
-#define IEEE80211_QOS_CTL_TID_MASK      0x000F
-#define IEEE80211_QOS_CTL_TAG1D_MASK    0x0007
+/* 1d tag mask */
+#define IEEE80211_QOS_CTL_TAG1D_MASK            0x0007
+/* TID mask */
+#define IEEE80211_QOS_CTL_TID_MASK              0x000f
+/* EOSP */
+#define IEEE80211_QOS_CTL_EOSP                  0x0010
+/* ACK policy */
+#define IEEE80211_QOS_CTL_ACK_POLICY_NORMAL     0x0000
+#define IEEE80211_QOS_CTL_ACK_POLICY_NOACK      0x0020
+#define IEEE80211_QOS_CTL_ACK_POLICY_NO_EXPL    0x0040
+#define IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK   0x0060
+/* A-MSDU 802.11n */
+#define IEEE80211_QOS_CTL_A_MSDU_PRESENT        0x0080
 
 /* U-APSD queue for WMM IEs sent by AP */
 #define IEEE80211_WMM_IE_AP_QOSINFO_UAPSD       (1<<7)
@@ -1423,9 +1434,6 @@ enum ieee80211_sa_query_action {
 };
 
 
-/* A-MSDU 802.11n */
-#define IEEE80211_QOS_CONTROL_A_MSDU_PRESENT 0x0080
-
 /* cipher suite selectors */
 #define WLAN_CIPHER_SUITE_USE_GROUP     0x000FAC00
 #define WLAN_CIPHER_SUITE_WEP40         0x000FAC01