summaryrefslogtreecommitdiffstats
path: root/net/mac80211/wme.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-07-27 15:43:22 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:47:30 -0700
commit6e0d114d52833449a4e40f6dc8582e88d0742be4 (patch)
treebabc9afb1adfb418bb6853db9701e2df3c580838 /net/mac80211/wme.h
parent571ecf676d66735f59be6b950360e4074f02f47d (diff)
downloadlinux-6e0d114d52833449a4e40f6dc8582e88d0742be4.tar.gz
linux-6e0d114d52833449a4e40f6dc8582e88d0742be4.tar.bz2
linux-6e0d114d52833449a4e40f6dc8582e88d0742be4.zip
[MAC80211]: move QoS rx handlers into rx.c
This patch moves the QoS handlers into rx.c making it possible to compile wme.c only when NET_SCHED is defined. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Jiri Benc <jbenc@suse.cz> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wme.h')
-rw-r--r--net/mac80211/wme.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h
index f0bff10f0e08..76c713a6450c 100644
--- a/net/mac80211/wme.h
+++ b/net/mac80211/wme.h
@@ -24,11 +24,10 @@
#define QOS_CONTROL_TAG1D_MASK 0x07
-ieee80211_txrx_result
-ieee80211_rx_h_parse_qos(struct ieee80211_txrx_data *rx);
-
-ieee80211_txrx_result
-ieee80211_rx_h_remove_qos_control(struct ieee80211_txrx_data *rx);
+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);