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 ab015c6..3c3bc9e 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -1,18 +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 unsure, say N.
 
-         If =n, drivers using mac80211 will be configured via
-         wireless extension support provided by that subsystem.
+config WIRELESS_OLD_REGULATORY
+       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 option is available
+         for historical reasons and it is advised to leave it off.
 
-         If unsure, say Y.
+         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"
@@ -39,4 +49,34 @@ 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.
+
+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.