X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fmac80211%2Fwme.h;h=1aca609eccfcc1c8e63dfbfbfd2a530f7af47b77;hb=5ce2d488fe039ddd86a638496cf704df86c74eeb;hp=fcc6b05508ccf06eeeb94c4ff7869c148b7168f4;hpb=dd32f7effdd2f3f348ef91ca1649d78a0ab2b103;p=linux-2.6

diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h
index fcc6b05508..1aca609ecc 100644
--- a/net/mac80211/wme.h
+++ b/net/mac80211/wme.h
@@ -19,19 +19,11 @@
 #define QOS_CONTROL_ACK_POLICY_NORMAL 0
 #define QOS_CONTROL_ACK_POLICY_NOACK 1
 
-#define QOS_CONTROL_TID_MASK 0x0f
 #define QOS_CONTROL_ACK_POLICY_SHIFT 5
 
-#define QOS_CONTROL_TAG1D_MASK 0x07
-
 extern const int ieee802_1d_to_ac[8];
 
-static inline int WLAN_FC_IS_QOS_DATA(u16 fc)
-{
-	return (fc & 0x8C) == 0x88;
-}
-
-#ifdef CONFIG_NET_SCHED
+#ifdef CONFIG_MAC80211_QOS
 void ieee80211_install_qdisc(struct net_device *dev);
 int ieee80211_qdisc_installed(struct net_device *dev);
 int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,