linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / wireless / Kconfig

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index ec37df7..8101657 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -7,7 +7,6 @@ menu "Wireless LAN (non-hamradio)"
 
 config NET_RADIO
        bool "Wireless LAN drivers (non-hamradio) & Wireless Extensions"
-       select WIRELESS_EXT
        ---help---
          Support for wireless LANs and everything having to do with radio,
          but not with amateur radio or FM broadcasting.
@@ -25,16 +24,6 @@ config NET_RADIO
          the tools from
          <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
 
-config NET_WIRELESS_RTNETLINK
-       bool "Wireless Extension API over RtNetlink"
-       depends on NET_RADIO
-       ---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.
-
 # Note : the cards are obsolete (can't buy them anymore), but the drivers
 # are not, as people are still using them...
 comment "Obsolete Wireless cards support (pre-802.11)"
@@ -146,9 +135,8 @@ comment "Wireless 802.11b ISA/PCI cards support"
 
 config IPW2100
        tristate "Intel PRO/Wireless 2100 Network Connection"
-       depends on NET_RADIO && PCI
+       depends on NET_RADIO && PCI && IEEE80211
        select FW_LOADER
-       select IEEE80211
        ---help---
           A driver for the Intel PRO/Wireless 2100 Network 
          Connection 802.11b wireless network adapter.
@@ -200,9 +188,8 @@ config IPW2100_DEBUG
 
 config IPW2200
        tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
-       depends on NET_RADIO && PCI
+       depends on NET_RADIO && IEEE80211 && PCI
        select FW_LOADER
-       select IEEE80211
        ---help---
           A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
          Connection adapters. 
@@ -214,7 +201,7 @@ config IPW2200
          In order to use this driver, you will need a firmware image for it.
           You can obtain the firmware from
          <http://ipw2200.sf.net/>.  See the above referenced README.ipw2200 
-         for information on where to install the firmware images.
+         for information on where to install the firmare images.
 
           You will also very likely need the Wireless Tools in order to
           configure your card:
@@ -226,19 +213,6 @@ config IPW2200
           say M here and read <file:Documentation/modules.txt>.  The module
           will be called ipw2200.ko.
 
-config IPW2200_MONITOR
-        bool "Enable promiscuous mode"
-        depends on IPW2200
-        ---help---
-         Enables promiscuous/monitor mode support for the ipw2200 driver.
-         With this feature compiled into the driver, you can switch to 
-         promiscuous mode via the Wireless Tool's Monitor mode.  While in this
-         mode, no packets can be sent.
-
-config IPW_QOS
-        bool "Enable QoS support"
-        depends on IPW2200 && EXPERIMENTAL
-
 config IPW2200_DEBUG
        bool "Enable full debugging output in IPW2200 module."
        depends on IPW2200
@@ -263,15 +237,6 @@ config IPW2200_DEBUG
          If you are not trying to debug or develop the IPW2200 driver, you 
          most likely want to say N here.
 
-config IPW2200_MONITOR
-       bool "Enable promiscuous mode"
-       depends on IPW2200
-       ---help---
-         Enables promiscuous/monitor mode support for the ipw2200 driver.
-         With this feature compiled into the driver, you can switch to
-         promiscuous mode via the Wireless Tool's Monitor mode.  While in this
-         mode, no packets can be sent.
-
 config AIRO
        tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
        depends on NET_RADIO && ISA_DMA_API && (PCI || BROKEN)
@@ -281,7 +246,7 @@ config AIRO
          PCI 802.11 wireless cards.
          It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X
          - with or without encryption) as well as card before the Cisco
-         acquisition (Aironet 4500, Aironet 4800, Aironet 4800B).
+         aquisition (Aironet 4500, Aironet 4800, Aironet 4800B).
 
          This driver support both the standard Linux Wireless Extensions
          and Cisco proprietary API, so both the Linux Wireless Tools and the
@@ -318,10 +283,7 @@ config APPLE_AIRPORT
          Say Y here to support the Airport 802.11b wireless Ethernet hardware
          built into the Macintosh iBook and other recent PowerPC-based
          Macintosh machines. This is essentially a Lucent Orinoco card with 
-         a non-standard interface.
-
-         This driver does not support the Airport Extreme (802.11b/g). Use
-         the BCM43xx driver for Airport Extreme cards.
+         a non-standard interface
 
 config PLX_HERMES
        tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.)"
@@ -365,7 +327,7 @@ config PCI_HERMES
 
 config ATMEL
       tristate "Atmel at76c50x chipset  802.11b support"
-      depends on NET_RADIO && (PCI || PCMCIA)
+      depends on NET_RADIO
       select FW_LOADER
       select CRC32
        ---help---
@@ -434,7 +396,7 @@ config AIRO_CS
          driver part of the Linux Pcmcia package.
          It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X
          - with or without encryption) as well as card before the Cisco
-         acquisition (Aironet 4500, Aironet 4800, Aironet 4800B). It also
+         aquisition (Aironet 4500, Aironet 4800, Aironet 4800B). It also
          supports OEM of Cisco such as the DELL TrueMobile 4800 and Xircom
          802.11b cards.
 
@@ -513,7 +475,6 @@ config PRISM54
          will be called prism54.ko.
 
 source "drivers/net/wireless/hostap/Kconfig"
-source "drivers/net/wireless/bcm43xx/Kconfig"
 
 # yes, this works even when no drivers are selected
 config NET_WIRELESS