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 45c7c0c3875e808beb1ad1085a213955d6ca8235..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
 
@@ -32,15 +44,6 @@ config MAC80211_RC_DEFAULT_PID
          default rate control algorithm. You should choose
          this unless you know what you are doing.
 
-config MAC80211_RC_DEFAULT_SIMPLE
-       bool "Simple rate control algorithm"
-       select MAC80211_RC_SIMPLE
-       ---help---
-         Select the simple rate control as the default rate
-         control algorithm. Note that this is a non-responsive,
-         dumb algorithm. You should choose the PID rate control
-         instead.
-
 config MAC80211_RC_DEFAULT_NONE
        bool "No default algorithm"
        depends on EMBEDDED
@@ -57,7 +60,6 @@ comment "build the algorithm into mac80211."
 config MAC80211_RC_DEFAULT
        string
        default "pid" if MAC80211_RC_DEFAULT_PID
-       default "simple" if MAC80211_RC_DEFAULT_SIMPLE
        default ""
 
 config MAC80211_RC_PID
@@ -70,20 +72,22 @@ config MAC80211_RC_PID
          Say Y or M unless you're sure you want to use a
          different rate control algorithm.
 
-config MAC80211_RC_SIMPLE
-       tristate "Simple rate control algorithm (DEPRECATED)"
+endmenu
+
+config MAC80211_MESH
+       bool "Enable mac80211 mesh networking (pre-802.11s) support"
+       depends on MAC80211 && EXPERIMENTAL
        ---help---
-         This option enables a very simple, non-responsive TX
-         rate control algorithm. This algorithm is deprecated
-         and will be removed from the kernel in the near future.
-         It has been replaced by the PID algorithm.
+        This options enables support of Draft 802.11s mesh networking.
+        The implementation is based on Draft 1.08 of the Mesh Networking
+        amendment. For more information visit http://o11s.org/.
 
-         Say N unless you know what you are doing.
-endmenu
 
 config MAC80211_LEDS
        bool "Enable LED triggers"
-       depends on MAC80211 && LEDS_TRIGGERS
+       depends on MAC80211
+       select NEW_LEDS
+       select LEDS_TRIGGERS
        ---help---
          This option enables a few LED triggers for different
          packet receive/transmit events.
@@ -166,3 +170,10 @@ config MAC80211_VERBOSE_PS_DEBUG
        ---help---
          Say Y here to print out verbose powersave
          mode debug messages.
+
+config MAC80211_VERBOSE_MPL_DEBUG
+       bool "Verbose mesh peer link debugging"
+       depends on MAC80211_DEBUG && MAC80211_MESH
+       ---help---
+         Say Y here to print out verbose mesh peer link
+         debug messages.