X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=net%2Fwireless%2FKconfig;h=3c3bc9e579edad5f7719577fc96ecea9f136250f;hb=5e392739d6ab72f7c35040aa07f4097904bce6e7;hp=f7c64dbe86cc9cd65e4a281cbf5ab485c0015930;hpb=274bfb8dc5ffa16cb073801bebe76ab7f4e2e73d;p=safe%2Fjmp%2Flinux-2.6

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index f7c64db..3c3bc9e 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -1,49 +1,28 @@
 config CFG80211
         tristate "Improved wireless configuration API"
 
-config NL80211
-	bool "nl80211 new netlink interface support"
+config CFG80211_REG_DEBUG
+	bool "cfg80211 regulatory debugging"
 	depends on CFG80211
-	default y
+	default n
 	---help---
-	  This option turns on the new netlink interface
-	  (nl80211) support in cfg80211.
-
-	  If =n, drivers using mac80211 will be configured via
-	  wireless extension support provided by that subsystem.
+	  You can enable this if you want to debug regulatory changes.
 
-	  If unsure, say Y.
+	  If unsure, say N.
 
 config WIRELESS_OLD_REGULATORY
 	bool "Old wireless static regulatory definitions"
-	default y
+	default n
 	---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.
+	  and uses it within the new framework. This option is available
+	  for historical reasons and it is advised to leave it off.
+
+	  For details see:
+
+	  http://wireless.kernel.org/en/developers/Regulatory
+
+	  Say N and if you say Y, please tell us why. The default is N.
 
 config WIRELESS_EXT
 	bool "Wireless extensions"
@@ -91,3 +70,13 @@ config LIB80211_CRYPT_CCMP
 
 config LIB80211_CRYPT_TKIP
 	tristate
+
+config LIB80211_DEBUG
+	bool "lib80211 debugging messages"
+	depends on LIB80211
+	default n
+	---help---
+	  You can enable this if you want verbose debugging messages
+	  from lib80211.
+
+	  If unsure, say N.