Merge branch 'linus' into x86/urgent

[linux-2.6-omap-h63xx.git] / net / mac80211 / wme.h

diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h
index 76c713a6450c37290f0ba521cbe2e212e06bc514..04de28c071a673f23301bb482ab949700d57c80c 100644 (file)
--- a/net/mac80211/wme.h
+++ b/net/mac80211/wme.h
@@ -19,38 +19,16 @@
 #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
-
-static inline int WLAN_FC_IS_QOS_DATA(u16 fc)
-{
-       return (fc & 0x8C) == 0x88;
-}
-
-#ifdef CONFIG_NET_SCHED
-void ieee80211_install_qdisc(struct net_device *dev);
-int ieee80211_qdisc_installed(struct net_device *dev);
-
-int ieee80211_wme_register(void);
-void ieee80211_wme_unregister(void);
-#else
-static inline void ieee80211_install_qdisc(struct net_device *dev)
-{
-}
-static inline int ieee80211_qdisc_installed(struct net_device *dev)
-{
-       return 0;
-}
-
-static inline int ieee80211_wme_register(void)
-{
-       return 0;
-}
-static inline void ieee80211_wme_unregister(void)
-{
-}
-#endif /* CONFIG_NET_SCHED */
+extern const int ieee802_1d_to_ac[8];
+
+u16 ieee80211_select_queue(struct net_device *dev, struct sk_buff *skb);
+int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
+                              struct sta_info *sta, u16 tid);
+void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
+                                  struct sta_info *sta, u16 tid,
+                                  u8 requeue);
+void ieee80211_requeue(struct ieee80211_local *local, int queue);
 
 #endif /* _WME_H */