Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index a24b459dd45aecf9ba8e1214fce68fe2b8330c6c..590e00b2766c8dbee2600dd33fd6d2b485d7bc46 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -7,11 +7,23 @@ config MAC80211
        select CRC32
        select WIRELESS_EXT
        select CFG80211
-       select NET_SCH_FIFO
        ---help---
          This option enables the hardware independent IEEE 802.11
          networking stack.
 
+config MAC80211_QOS
+       def_bool y
+       depends on MAC80211
+       depends on NET_SCHED
+       depends on NETDEVICES_MULTIQUEUE
+
+comment "QoS/HT support disabled"
+       depends on MAC80211 && !MAC80211_QOS
+comment "QoS/HT support needs CONFIG_NET_SCHED"
+       depends on MAC80211 && !NET_SCHED
+comment "QoS/HT support needs CONFIG_NETDEVICES_MULTIQUEUE"
+       depends on MAC80211 && !NETDEVICES_MULTIQUEUE
+
 menu "Rate control algorithm selection"
        depends on MAC80211 != n