the scheduled ieee80211 softmac removal

[linux-2.6] / net / mac80211 / Kconfig

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 09c255002e565dcba6606937d0c1a14409537212..3c3f62faae1e7158a16f5cab3d756bdb50880240 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -1,6 +1,5 @@
 config MAC80211
        tristate "Generic IEEE 802.11 Networking Stack (mac80211)"
-       depends on EXPERIMENTAL
        select CRYPTO
        select CRYPTO_ECB
        select CRYPTO_ARC4
@@ -82,6 +81,15 @@ config MAC80211_RC_SIMPLE
          Say N unless you know what you are doing.
 endmenu
 
+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/.
+
+
 config MAC80211_LEDS
        bool "Enable LED triggers"
        depends on MAC80211 && LEDS_TRIGGERS
@@ -98,6 +106,18 @@ config MAC80211_DEBUGFS
 
          Say N unless you know you need this.
 
+config MAC80211_DEBUG_PACKET_ALIGNMENT
+       bool "Enable packet alignment debugging"
+       depends on MAC80211
+       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_DEBUG
        bool "Enable debugging output"
        depends on MAC80211
@@ -155,3 +175,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.