dccp: Limit feature negotiation to connection setup phase

[linux-2.6] / net / wireless / Kconfig

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index ab015c6..ae7f226 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -14,6 +14,37 @@ config NL80211
 
          If unsure, say Y.
 
+config WIRELESS_OLD_REGULATORY
+       bool "Old wireless static regulatory definitions"
+       default y
+       ---help---
+         This option enables the old static regulatory information
+         and uses it within the new framework. This is available
+         temporarily as an option to help prevent immediate issues
+         due to the switch to the new regulatory framework which
+         does require a new userspace application which has the
+         database of regulatory information (CRDA) and another for
+         setting regulatory domains (iw).
+
+         For more information see:
+
+         http://wireless.kernel.org/en/developers/Regulatory/CRDA
+         http://wireless.kernel.org/en/users/Documentation/iw
+
+         It is important to note though that if you *do* have CRDA present
+         and if this option is enabled CRDA *will* be called to update the
+         regulatory domain (for US and JP only). Support for letting the user
+         set the regulatory domain through iw is also supported. This option
+         mainly exists to leave around for a kernel release some old static
+         regulatory domains that were defined and to keep around the old
+         ieee80211_regdom module parameter. This is being phased out and you
+         should stop using them ASAP.
+
+         Say Y unless you have installed a new userspace application.
+         Also say Y if have one currently depending on the ieee80211_regdom
+         module parameter and cannot port it to use the new userspace
+         interfaces.
+
 config WIRELESS_EXT
        bool "Wireless extensions"
        default n
@@ -39,4 +70,15 @@ config WIRELESS_EXT_SYSFS
          files in /sys/class/net/*/wireless/. The same information
          is available via the ioctls as well.
 
-         Say Y if you have programs using it (we don't know of any).
+         Say Y if you have programs using it, like old versions of
+         hal.
+
+config LIB80211
+       tristate "Common routines for IEEE802.11 drivers"
+       default n
+       help
+         This options enables a library of common routines used
+         by IEEE802.11 wireless LAN drivers.
+
+         Drivers should select this themselves if needed.  Say Y if
+         you want this built into your kernel.