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 7d82be0..ae7f226 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -16,7 +16,7 @@ config NL80211
 
 config WIRELESS_OLD_REGULATORY
        bool "Old wireless static regulatory definitions"
-       default n
+       default y
        ---help---
          This option enables the old static regulatory information
          and uses it within the new framework. This is available
@@ -40,11 +40,10 @@ config WIRELESS_OLD_REGULATORY
          ieee80211_regdom module parameter. This is being phased out and you
          should stop using them ASAP.
 
-         Say N unless you cannot install a new userspace application
-         or have one currently depending on the ieee80211_regdom module
-         parameter and cannot port it to use the new userspace interfaces.
-
-         This is scheduled for removal for 2.6.29.
+         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"
@@ -73,3 +72,13 @@ config WIRELESS_EXT_SYSFS
 
          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.