summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2017-01-05 15:37:28 +0300
committerJohannes Berg <johannes.berg@intel.com>2017-01-05 15:37:28 +0300
commit3db5e3e707ebb9ab0ce3a2dcd924ed2ea525d770 (patch)
tree5ee51e9c6c7f8d3757b70449630b44c97e8a7ce6
parent343884c87e5a928193796415280269e723f951c7 (diff)
downloadlinux-3db5e3e707ebb9ab0ce3a2dcd924ed2ea525d770.tar.xz
wireless: move IEEE80211_NUM_ACS to ieee80211.h
This constant isn't really specific to mac80211, so move it "up" a level to ieee80211.h Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--include/linux/ieee80211.h2
-rw-r--r--include/net/mac80211.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index fe849329511a..87d1937e4671 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -185,6 +185,8 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2)
/* number of user priorities 802.11 uses */
#define IEEE80211_NUM_UPS 8
+/* number of ACs */
+#define IEEE80211_NUM_ACS 4
#define IEEE80211_QOS_CTL_LEN 2
/* 1d tag mask */
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 5345d358a510..5f5cb194cd78 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -147,7 +147,6 @@ enum ieee80211_ac_numbers {
IEEE80211_AC_BE = 2,
IEEE80211_AC_BK = 3,
};
-#define IEEE80211_NUM_ACS 4
/**
* struct ieee80211_tx_queue_params - transmit queue configuration