Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / net / wireless / Kconfig

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index a228d56a91b848c6569a5f94ddb342f674a0d34c..ab015c62d5612cd42b558179dee05a00ef3b2218 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -1,6 +1,19 @@
 config CFG80211
         tristate "Improved wireless configuration API"
 
 config CFG80211
         tristate "Improved wireless configuration API"
 

+config NL80211
+       bool "nl80211 new netlink interface support"
+       depends on CFG80211
+       default y
+       ---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.
+
+         If unsure, say Y.
+

 config WIRELESS_EXT
        bool "Wireless extensions"
        default n
 config WIRELESS_EXT
        bool "Wireless extensions"
        default n


@@ -10,7 +23,20 @@ config WIRELESS_EXT
 
          Wireless extensions will be replaced by cfg80211 and
          will be required only by legacy drivers that implement
 
          Wireless extensions will be replaced by cfg80211 and
          will be required only by legacy drivers that implement

-         wireless extension handlers.
+         wireless extension handlers. This option does not
+         affect the wireless-extension backward compatibility
+         code in cfg80211.

 
          Say N (if you can) unless you know you need wireless
          extensions for external modules.
 
          Say N (if you can) unless you know you need wireless
          extensions for external modules.

+
+config WIRELESS_EXT_SYSFS
+       bool "Wireless extensions sysfs files"
+       default y
+       depends on WIRELESS_EXT && SYSFS
+       help
+         This option enables the deprecated wireless statistics
+         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).