netpoll: don't dereference NULL dev from np

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

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index b97bd9f..3c3bc9e 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -1,50 +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.
+         You can enable this if you want to debug regulatory changes.
 
-         If =n, drivers using mac80211 will be configured via
-         wireless extension support provided by that subsystem.
-
-         If unsure, say Y.
+         If unsure, say N.
 
 config WIRELESS_OLD_REGULATORY
-       bool "Old wireless static regulatory defintions"
+       bool "Old wireless static regulatory definitions"
        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:
+         and uses it within the new framework. This option is available
+         for historical reasons and it is advised to leave it off.
 
-         http://wireless.kernel.org/en/developers/Regulatory/CRDA
-         http://wireless.kernel.org/en/users/Documentation/iw
+         For details see:
 
-         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.
+         http://wireless.kernel.org/en/developers/Regulatory
 
-         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 N and if you say Y, please tell us why. The default is N.
 
 config WIRELESS_EXT
        bool "Wireless extensions"
@@ -73,3 +51,32 @@ 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.
+
+config LIB80211_CRYPT_WEP
+       tristate
+
+config LIB80211_CRYPT_CCMP
+       tristate
+
+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.