commit 6e0d114d52833449a4e40f6dc8582e88d0742be4
author Johannes Berg <johannes@sipsolutions.net> Fri Jul 27 15:43:22 2007 +0200
committer David S. Miller <davem@sunset.davemloft.net> Wed Oct 10 16:47:30 2007 -0700
tree babc9afb1adfb418bb6853db9701e2df3c580838
parent 571ecf676d66735f59be6b950360e4074f02f47d

[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>

net/mac80211/Makefile

diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index b585399..0353e75 100644
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -2,6 +2,7 @@
 
 mac80211-objs-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o
 mac80211-objs-$(CONFIG_MAC80211_DEBUGFS) += debugfs.o debugfs_sta.o debugfs_netdev.o debugfs_key.o
+mac80211-objs-$(CONFIG_NET_SCHED) += wme.o
 
 mac80211-objs := \
 	ieee80211.o \
@@ -16,7 +17,6 @@
 	regdomain.o \
 	tkip.o \
 	aes_ccm.o \
-	wme.o \
 	ieee80211_cfg.o \
 	rx.o \
 	$(mac80211-objs-y)