Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[karo-tx-linux.git] / net / mac80211 / Kconfig

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index a10d508b07e146daabe99ad21306fc99ecdc8c2f..8a91f6c0bb1800a8149623c059bdde6e135361b7 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -15,8 +15,12 @@ comment "CFG80211 needs to be enabled for MAC80211"
 
 if MAC80211 != n
 
+config MAC80211_HAS_RC
+       def_bool n
+
 config MAC80211_RC_PID
        bool "PID controller based rate control algorithm" if EMBEDDED
+       select MAC80211_HAS_RC
        ---help---
          This option enables a TX rate control algorithm for
          mac80211 that uses a PID controller to select the TX
@@ -24,12 +28,14 @@ config MAC80211_RC_PID
 
 config MAC80211_RC_MINSTREL
        bool "Minstrel" if EMBEDDED
+       select MAC80211_HAS_RC
        default y
        ---help---
          This option enables the 'minstrel' TX rate control algorithm
 
 choice
        prompt "Default rate control algorithm"
+       depends on MAC80211_HAS_RC
        default MAC80211_RC_DEFAULT_MINSTREL
        ---help---
          This option selects the default rate control algorithm
@@ -62,6 +68,9 @@ config MAC80211_RC_DEFAULT
 
 endif
 
+comment "Some wireless drivers require a rate control algorithm"
+       depends on MAC80211_HAS_RC=n
+
 config MAC80211_MESH
        bool "Enable mac80211 mesh networking (pre-802.11s) support"
        depends on MAC80211 && EXPERIMENTAL
@@ -96,18 +105,6 @@ menuconfig MAC80211_DEBUG_MENU
        ---help---
          This option collects various mac80211 debug settings.
 
-config MAC80211_DEBUG_PACKET_ALIGNMENT
-       bool "Enable packet alignment debugging"
-       depends on MAC80211_DEBUG_MENU
-       ---help---
-         This option is recommended for driver authors and strongly
-         discouraged for everybody else, it will trigger a warning
-         when a driver hands mac80211 a buffer that is aligned in
-         a way that will cause problems with the IP stack on some
-         architectures.
-
-         Say N unless you're writing a mac80211 based driver.
-
 config MAC80211_NOINLINE
        bool "Do not inline TX/RX handlers"
        depends on MAC80211_DEBUG_MENU
@@ -224,8 +221,8 @@ config MAC80211_DRIVER_API_TRACER
        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.
+         framework for the driver API -- you can then see which
+         driver methods it is calling and which API functions
+         drivers are calling by looking at the trace.
 
-         If unsure, say N.
+         If unsure, say Y.