Merge git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6] / net / wireless / Kconfig

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index ca2f05c29760bc95b2812ed05f09eb5a63916fac..79270903bda6f2bb02553baff2b71137d87bdfd2 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -1,3 +1,19 @@
+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


@@ -7,17 +23,9 @@ 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 NET_WIRELESS_RTNETLINK
-       bool "Wireless Extension API over RtNetlink"
-       depends on WIRELESS_EXT
-       ---help---
-         Support the Wireless Extension API over the RtNetlink socket
-         in addition to the traditional ioctl interface (selected above).
-
-         For now, few tools use this facility, but it might grow in the
-         future. The only downside is that it adds 4.5 kB to your kernel.