Revert "sunrpc: move the close processing after do recvfrom method"

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

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index ec64571..90e93a5 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -1,6 +1,65 @@
+config WIRELESS_EXT
+       bool
+
+config WEXT_CORE
+       def_bool y
+       depends on CFG80211_WEXT || WIRELESS_EXT
+
+config WEXT_PROC
+       def_bool y
+       depends on PROC_FS
+       depends on WEXT_CORE
+
+config WEXT_SPY
+       bool
+
+config WEXT_PRIV
+       bool
+
 config CFG80211
-       tristate "Improved wireless configuration API"
+       tristate "cfg80211 - wireless configuration API"
        depends on RFKILL || !RFKILL
+       ---help---
+         cfg80211 is the Linux wireless LAN (802.11) configuration API.
+         Enable this if you have a wireless device.
+
+         For more information refer to documentation on the wireless wiki:
+
+         http://wireless.kernel.org/en/developers/Documentation/cfg80211
+
+         When built as a module it will be called cfg80211.
+
+config NL80211_TESTMODE
+       bool "nl80211 testmode command"
+       depends on CFG80211
+       help
+         The nl80211 testmode command helps implementing things like
+         factory calibration or validation tools for wireless chips.
+
+         Select this option ONLY for kernels that are specifically
+         built for such purposes.
+
+         Debugging tools that are supposed to end up in the hands of
+         users should better be implemented with debugfs.
+
+         Say N.
+
+config CFG80211_DEVELOPER_WARNINGS
+       bool "enable developer warnings"
+       depends on CFG80211
+       default n
+       help
+         This option enables some additional warnings that help
+         cfg80211 developers and driver developers, but that can
+         trigger due to races with userspace.
+
+         For example, when a driver reports that it was disconnected
+         from the AP, but the user disconnects manually at the same
+         time, the warning might trigger spuriously due to races.
+
+         Say Y only if you are developing cfg80211 or a driver based
+         on it (or mac80211).
+
 
 config CFG80211_REG_DEBUG
        bool "cfg80211 regulatory debugging"
@@ -8,12 +67,28 @@ config CFG80211_REG_DEBUG
        default n
        ---help---
          You can enable this if you want to debug regulatory changes.
+         For more information on cfg80211 regulatory refer to the wireless
+         wiki:
+
+         http://wireless.kernel.org/en/developers/Regulatory
 
          If unsure, say N.
 
+config CFG80211_DEFAULT_PS
+       bool "enable powersave by default"
+       depends on CFG80211
+       default y
+       help
+         This option enables powersave mode by default.
+
+         If this causes your applications to misbehave you should fix your
+         applications instead -- they need to register their network
+         latency requirement, see Documentation/power/pm_qos_interface.txt.
+
 config CFG80211_DEBUGFS
        bool "cfg80211 DebugFS entries"
-       depends on CFG80211 && DEBUG_FS
+       depends on CFG80211
+       depends on DEBUG_FS
        ---help---
          You can enable this if you want to debugfs entries for cfg80211.
 
@@ -22,6 +97,7 @@ config CFG80211_DEBUGFS
 config WIRELESS_OLD_REGULATORY
        bool "Old wireless static regulatory definitions"
        default n
+       depends on CFG80211
        ---help---
          This option enables the old static regulatory information
          and uses it within the new framework. This option is available
@@ -33,20 +109,19 @@ config WIRELESS_OLD_REGULATORY
 
          Say N and if you say Y, please tell us why. The default is N.
 
-config WIRELESS_EXT
-       bool "Wireless extensions"
+config CFG80211_WEXT
+       bool "cfg80211 wireless extensions compatibility"
+       depends on CFG80211
+       select WEXT_CORE
        default y
-       ---help---
-         This option enables the legacy wireless extensions
-         (wireless network interface configuration via ioctls.)
-
-         Say Y unless you've upgraded all your userspace to use
-         nl80211 instead of wireless extensions.
+       help
+         Enable this option if you need old userspace for wireless
+         extensions with cfg80211-based drivers.
 
 config WIRELESS_EXT_SYSFS
        bool "Wireless extensions sysfs files"
        default y
-       depends on WIRELESS_EXT && SYSFS
+       depends on WEXT_CORE && SYSFS
        help
          This option enables the deprecated wireless statistics
          files in /sys/class/net/*/wireless/. The same information