sctp: fix sctp_setsockopt_autoclose compile warning

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

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index d203841..a10d508 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -1,44 +1,40 @@
 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.
 
-config MAC80211_QOS
-       def_bool y
-       depends on MAC80211
-       depends on NET_SCHED
-
-comment "QoS/HT support disabled"
-       depends on MAC80211 && !MAC80211_QOS
-comment "QoS/HT support needs CONFIG_NET_SCHED"
-       depends on MAC80211 && !NET_SCHED
+comment "CFG80211 needs to be enabled for MAC80211"
+       depends on CFG80211=n
 
-menu "Rate control algorithm selection"
-       depends on MAC80211 != n
+if MAC80211 != n
 
 config MAC80211_RC_PID
        bool "PID controller based rate control algorithm" if EMBEDDED
-       default y
        ---help---
          This option enables a TX rate control algorithm for
          mac80211 that uses a PID controller to select the TX
          rate.
 
+config MAC80211_RC_MINSTREL
+       bool "Minstrel" if EMBEDDED
+       default y
+       ---help---
+         This option enables the 'minstrel' TX rate control algorithm
+
 choice
        prompt "Default rate control algorithm"
-       default MAC80211_RC_DEFAULT_PID
+       default MAC80211_RC_DEFAULT_MINSTREL
        ---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
@@ -49,23 +45,32 @@ config MAC80211_RC_DEFAULT_PID
          default rate control algorithm. You should choose
          this unless you know what you are doing.
 
+config MAC80211_RC_DEFAULT_MINSTREL
+       bool "Minstrel"
+       depends on MAC80211_RC_MINSTREL
+       ---help---
+         Select Minstrel as the default rate control algorithm.
+
+
 endchoice
 
 config MAC80211_RC_DEFAULT
        string
+       default "minstrel" if MAC80211_RC_DEFAULT_MINSTREL
        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"
@@ -189,18 +194,18 @@ config MAC80211_VERBOSE_MPL_DEBUG
 
          Do not select this option.
 
-config MAC80211_LOWTX_FRAME_DUMP
-       bool "Debug frame dumping"
+config MAC80211_VERBOSE_MHWMP_DEBUG
+       bool "Verbose mesh HWMP routing debugging"
        depends on MAC80211_DEBUG_MENU
+       depends on MAC80211_MESH
        ---help---
-         Selecting this option will cause the stack to
-         print a message for each frame that is handed
-         to the lowlevel driver for transmission. This
-         message includes all MAC addresses and the
-         frame control field.
+         Selecting this option causes mac80211 to print out very
+         verbose mesh routing (HWMP) debugging messages (when mac80211
+         is taking part in a mesh network).
+         It should not be selected on production systems as those
+         messages are remotely triggerable.
 
-         If unsure, say N and insert the debugging code
-         you require into the driver you are debugging.
+         Do not select this option.
 
 config MAC80211_DEBUG_COUNTERS
        bool "Extra statistics for TX/RX debugging"
@@ -213,9 +218,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.