mac80211: Move mpath and mpp growth to mesh workqueue.

[pandora-kernel.git] / net / mac80211 / Kconfig

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index ecc3faf..9db4ff8 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -1,16 +1,18 @@
 config MAC80211
        tristate "Generic IEEE 802.11 Networking Stack (mac80211)"
+       depends on CFG80211
        select CRYPTO
        select CRYPTO_ECB
        select CRYPTO_ARC4
        select CRYPTO_AES
        select CRC32
-       select WIRELESS_EXT
-       select CFG80211
        ---help---
          This option enables the hardware independent IEEE 802.11
          networking stack.
 
+comment "CFG80211 needs to be enabled for MAC80211"
+       depends on CFG80211=n
+
 menu "Rate control algorithm selection"
        depends on MAC80211 != n
 
@@ -66,9 +68,10 @@ config MAC80211_MESH
        depends on MAC80211 && EXPERIMENTAL
        ---help---
         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/.
-
+        The implementation is based on Draft 2.08 of the Mesh Networking
+        amendment.  However, no compliance with that draft is claimed or even
+        possible, as drafts leave a number of identifiers to be defined after
+        ratification.  For more information visit http://o11s.org/.
 
 config MAC80211_LEDS
        bool "Enable LED triggers"
@@ -202,3 +205,15 @@ config MAC80211_DEBUG_COUNTERS
          and show them in debugfs.
 
          If unsure, say N.
+
+config MAC80211_DRIVER_API_TRACER
+       bool "Driver API tracer"
+       depends on MAC80211_DEBUG_MENU
+       depends on EVENT_TRACING
+       help
+         Say Y here to make mac80211 register with the ftrace
+         framework for the driver API -- you can see which
+         driver methods it is calling then by looking at the
+         trace.
+
+         If unsure, say N.