Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[safe/jmp/linux-2.6] / net / mac80211 / Kconfig

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 60c1616..4d5543a 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -1,18 +1,19 @@
 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.
 
-menu "Rate control algorithm selection"
-       depends on MAC80211 != n
+comment "CFG80211 needs to be enabled for MAC80211"
+       depends on CFG80211=n
+
+if MAC80211 != n
 
 config MAC80211_RC_PID
        bool "PID controller based rate control algorithm" if EMBEDDED
@@ -33,7 +34,7 @@ choice
        ---help---
          This option selects the default rate control algorithm
          mac80211 will use. Note that this default can still be
-         overriden through the ieee80211_default_rc_algo module
+         overridden through the ieee80211_default_rc_algo module
          parameter if different algorithms are available.
 
 config MAC80211_RC_DEFAULT_PID
@@ -59,16 +60,17 @@ config MAC80211_RC_DEFAULT
        default "pid" if MAC80211_RC_DEFAULT_PID
        default ""
 
-endmenu
+endif
 
 config MAC80211_MESH
        bool "Enable mac80211 mesh networking (pre-802.11s) support"
        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"
@@ -203,9 +205,14 @@ config MAC80211_DEBUG_COUNTERS
 
          If unsure, say N.
 
-config MAC80211_VERBOSE_SPECT_MGMT_DEBUG
-       bool "Verbose Spectrum Management (IEEE 802.11h)debugging"
+config MAC80211_DRIVER_API_TRACER
+       bool "Driver API tracer"
        depends on MAC80211_DEBUG_MENU
-       ---help---
-         Say Y here to print out verbose Spectrum Management (IEEE 802.11h)
-         debug messages.
+       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.