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>

3 files changed, 2 insertions, 8 deletions

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 7fa8c6be7bf..b5493ecd1e9 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -338,7 +338,7 @@ static void ieee80211_parse_qos(struct ieee80211_rx_data *rx)
                 u8 *qc = ieee80211_get_qos_ctl(hdr);
                 /* frame has qos control */
                 tid = *qc & IEEE80211_QOS_CTL_TID_MASK;
-                if (*qc & IEEE80211_QOS_CONTROL_A_MSDU_PRESENT)
+                if (*qc & IEEE80211_QOS_CTL_A_MSDU_PRESENT)
                         status->rx_flags |= IEEE80211_RX_AMSDU;
         } else {
                 /*
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 28bc084dbfb..7a49532f14c 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -151,8 +151,7 @@ void ieee80211_set_qos_hdr(struct ieee80211_local *local, struct sk_buff *skb)
                 tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
 
                 if (unlikely(local->wifi_wme_noack_test))
-                        ack_policy |= QOS_CONTROL_ACK_POLICY_NOACK <<
-                                        QOS_CONTROL_ACK_POLICY_SHIFT;
+                        ack_policy |= IEEE80211_QOS_CTL_ACK_POLICY_NOACK;
                 /* qos header is 2 bytes, second reserved */
                 *p++ = ack_policy | tid;
                 *p = 0;
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,