* [PATCH v4 19/34] wireless: organize individual drivers alphabetically
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 95 +++++++++++++++++++++---------------------
1 files changed, 47 insertions(+), 48 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 51aa041..583eddc 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -14,30 +14,6 @@ menuconfig WLAN_PRE80211
This option does not affect the kernel build, it only
lets you choose drivers.
-config STRIP
- tristate "STRIP (Metricom starmode radio IP)"
- depends on INET && WLAN_PRE80211
- select WIRELESS_EXT
- ---help---
- Say Y if you have a Metricom radio and intend to use Starmode Radio
- IP. STRIP is a radio protocol developed for the MosquitoNet project
- (on the WWW at <http://mosquitonet.stanford.edu/>) to send Internet
- traffic using Metricom radios. Metricom radios are small, battery
- powered, 100kbit/sec packet radio transceivers, about the size and
- weight of a cellular telephone. (You may also have heard them called
- "Metricom modems" but we avoid the term "modem" because it misleads
- many people into thinking that you can plug a Metricom modem into a
- phone line and use it as a modem.)
-
- You can use STRIP on any Linux machine with a serial port, although
- it is obviously most useful for people with laptop computers. If you
- think you might get a Metricom radio in the future, there is no harm
- in saying Y to STRIP now, except that it makes the kernel a bit
- bigger.
-
- To compile this as a module, choose M here: the module will be
- called strip.
-
config ARLAN
tristate "Aironet Arlan 655 & IC2200 DS support"
depends on ISA && !64BIT && WLAN_PRE80211
@@ -89,6 +65,30 @@ config PCMCIA_WAVELAN
To compile this driver as a module, choose M here: the module will be
called wavelan_cs. If unsure, say N.
+config STRIP
+ tristate "STRIP (Metricom starmode radio IP)"
+ depends on INET && WLAN_PRE80211
+ select WIRELESS_EXT
+ ---help---
+ Say Y if you have a Metricom radio and intend to use Starmode Radio
+ IP. STRIP is a radio protocol developed for the MosquitoNet project
+ (on the WWW at <http://mosquitonet.stanford.edu/>) to send Internet
+ traffic using Metricom radios. Metricom radios are small, battery
+ powered, 100kbit/sec packet radio transceivers, about the size and
+ weight of a cellular telephone. (You may also have heard them called
+ "Metricom modems" but we avoid the term "modem" because it misleads
+ many people into thinking that you can plug a Metricom modem into a
+ phone line and use it as a modem.)
+
+ You can use STRIP on any Linux machine with a serial port, although
+ it is obviously most useful for people with laptop computers. If you
+ think you might get a Metricom radio in the future, there is no harm
+ in saying Y to STRIP now, except that it makes the kernel a bit
+ bigger.
+
+ To compile this as a module, choose M here: the module will be
+ called strip.
+
config PCMCIA_NETWAVE
tristate "Xircom Netwave AirSurfer Pcmcia wireless support"
depends on PCMCIA && WLAN_PRE80211
@@ -100,7 +100,6 @@ config PCMCIA_NETWAVE
To compile this driver as a module, choose M here: the module will be
called netwave_cs. If unsure, say N.
-
menuconfig WLAN_80211
bool "Wireless LAN (IEEE 802.11)"
depends on NETDEVICES
@@ -509,28 +508,6 @@ config USB_ZD1201
endif # ZYDAS_80211
-config PCMCIA_RAYCS
- tristate "Aviator/Raytheon 2.4GHz wireless support"
- depends on PCMCIA && WLAN_80211
- select WIRELESS_EXT
- ---help---
- Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
- (PC-card) wireless Ethernet networking card to your computer.
- Please read the file <file:Documentation/networking/ray_cs.txt> for
- details.
-
- To compile this driver as a module, choose M here: the module will be
- called ray_cs. If unsure, say N.
-
-config PCMCIA_WL3501
- tristate "Planet WL3501 PCMCIA cards"
- depends on EXPERIMENTAL && PCMCIA && WLAN_80211
- select WIRELESS_EXT
- ---help---
- A driver for WL3501 PCMCIA 802.11 wireless cards made by Planet.
- It has basic support for Linux wireless extensions and initial
- micro support for ethtool.
-
config ADM8211
tristate "ADMtek ADM8211 support"
depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
@@ -558,8 +535,30 @@ config ADM8211
Thanks to Infineon-ADMtek for their support of this driver.
-source "drivers/net/wireless/hostap/Kconfig"
+config PCMCIA_RAYCS
+ tristate "Aviator/Raytheon 2.4GHz wireless support"
+ depends on PCMCIA && WLAN_80211
+ select WIRELESS_EXT
+ ---help---
+ Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
+ (PC-card) wireless Ethernet networking card to your computer.
+ Please read the file <file:Documentation/networking/ray_cs.txt> for
+ details.
+
+ To compile this driver as a module, choose M here: the module will be
+ called ray_cs. If unsure, say N.
+
source "drivers/net/wireless/orinoco/Kconfig"
+source "drivers/net/wireless/hostap/Kconfig"
+
+config PCMCIA_WL3501
+ tristate "Planet WL3501 PCMCIA cards"
+ depends on EXPERIMENTAL && PCMCIA && WLAN_80211
+ select WIRELESS_EXT
+ ---help---
+ A driver for WL3501 PCMCIA 802.11 wireless cards made by Planet.
+ It has basic support for Linux wireless extensions and initial
+ micro support for ethtool.
config USB_NET_RNDIS_WLAN
tristate "Wireless RNDIS USB support"
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 18/34] wireless: move mac80211_hwsim to top level wireless driver menu
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville
Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Jouni Malinen,
Johannes Berg"
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
mac80211_hwsim is not a device driver for real hardware it is a
driver we can use to simulate a real device for testing mac80211.
Move it to the top wireless driver menu by removing its dependency
on WLAN_80211.
While at it move it outside of the WLAN_80211 section as we'll
be touching all those later.
Cc: Jouni Malinen <j@w1.fi>
Cc: Johannes Berg" <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index a6801fa..51aa041 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -558,19 +558,6 @@ config ADM8211
Thanks to Infineon-ADMtek for their support of this driver.
-config MAC80211_HWSIM
- tristate "Simulated radio testing tool for mac80211"
- depends on MAC80211 && WLAN_80211
- ---help---
- This driver is a developer testing tool that can be used to test
- IEEE 802.11 networking stack (mac80211) functionality. This is not
- needed for normal wireless LAN usage and is only for testing. See
- Documentation/networking/mac80211_hwsim for more information on how
- to use this tool.
-
- To compile this driver as a module, choose M here: the module will be
- called mac80211_hwsim. If unsure, say N.
-
source "drivers/net/wireless/hostap/Kconfig"
source "drivers/net/wireless/orinoco/Kconfig"
@@ -606,4 +593,17 @@ config USB_NET_RNDIS_WLAN
If you choose to build a module, it'll be called rndis_wlan.
+config MAC80211_HWSIM
+ tristate "Simulated radio testing tool for mac80211"
+ depends on MAC80211
+ ---help---
+ This driver is a developer testing tool that can be used to test
+ IEEE 802.11 networking stack (mac80211) functionality. This is not
+ needed for normal wireless LAN usage and is only for testing. See
+ Documentation/networking/mac80211_hwsim for more information on how
+ to use this tool.
+
+ To compile this driver as a module, choose M here: the module will be
+ called mac80211_hwsim. If unsure, say N.
+
endmenu
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 17/34] wireless: remove IEEE 802.11 description on hostapd
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Jouni Malinen
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
Its implied as hostap falls under the WLAN_80211 group menu.
Cc: Jouni Malinen <j@w1.fi>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/hostap/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/hostap/Kconfig b/drivers/net/wireless/hostap/Kconfig
index c15db22..13d074e 100644
--- a/drivers/net/wireless/hostap/Kconfig
+++ b/drivers/net/wireless/hostap/Kconfig
@@ -1,5 +1,5 @@
config HOSTAP
- tristate "IEEE 802.11 for Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)"
+ tristate "Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)"
depends on WLAN_80211
select WIRELESS_EXT
select CRYPTO
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 16/34] wireless: organize group drivers alphabetically
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 286 +++++++++++++++++++++---------------------
1 files changed, 144 insertions(+), 142 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 325d14d..a6801fa 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -110,77 +110,73 @@ menuconfig WLAN_80211
This option does not affect the kernel build, it only
lets you choose drivers.
-menuconfig MARVELL_80211
- bool "Marvell"
- depends on WLAN_80211
- ---help---
- This will enable the support for Marvell wireless drivers. This includes
- the drivers: libertas, libertas_tf, and mwl8k.
+source "drivers/net/wireless/ath/Kconfig"
-if MARVELL_80211
-config LIBERTAS
- tristate "Marvell 8xxx Libertas WLAN driver support"
+config ATMEL_80211
+ bool "Atmel"
depends on WLAN_80211
- select WIRELESS_EXT
- select LIB80211
- select FW_LOADER
- ---help---
- A library for Marvell Libertas 8xxx devices.
-
-config LIBERTAS_USB
- tristate "Marvell Libertas 8388 USB 802.11b/g cards"
- depends on LIBERTAS && USB
---help---
- A driver for Marvell Libertas 8388 USB devices.
+ This will enable the support for Atmel wireless drivers.
-config LIBERTAS_CS
- tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
- depends on LIBERTAS && PCMCIA
- select FW_LOADER
- ---help---
- A driver for Marvell Libertas 8385 CompactFlash devices.
+if ATMEL_80211
-config LIBERTAS_SDIO
- tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"
- depends on LIBERTAS && MMC
- ---help---
- A driver for Marvell Libertas 8385/8686/8688 SDIO devices.
+config ATMEL
+ tristate "Atmel at76c50x chipset 802.11b support"
+ depends on (PCI || PCMCIA) && WLAN_80211
+ select WIRELESS_EXT
+ select FW_LOADER
+ select CRC32
+ ---help---
+ A driver 802.11b wireless cards based on the Atmel fast-vnet
+ chips. This driver supports standard Linux wireless extensions.
-config LIBERTAS_SPI
- tristate "Marvell Libertas 8686 SPI 802.11b/g cards"
- depends on LIBERTAS && SPI
- ---help---
- A driver for Marvell Libertas 8686 SPI devices.
+ Many cards based on this chipset do not have flash memory
+ and need their firmware loaded at start-up. If yours is
+ one of these, you will need to provide a firmware image
+ to be loaded into the card by the driver. The Atmel
+ firmware package can be downloaded from
+ <http://www.thekelleys.org.uk/atmel>
-config LIBERTAS_DEBUG
- bool "Enable full debugging output in the Libertas module."
- depends on LIBERTAS
- ---help---
- Debugging support.
+config PCI_ATMEL
+ tristate "Atmel at76c506 PCI cards"
+ depends on ATMEL && PCI
+ ---help---
+ Enable support for PCI and mini-PCI cards containing the
+ Atmel at76c506 chip.
-config LIBERTAS_THINFIRM
- tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"
- depends on WLAN_80211 && MAC80211
+config PCMCIA_ATMEL
+ tristate "Atmel at76c502/at76c504 PCMCIA cards"
+ depends on ATMEL && PCMCIA
+ select WIRELESS_EXT
select FW_LOADER
+ select CRC32
---help---
- A library for Marvell Libertas 8xxx devices using thinfirm.
+ Enable support for PCMCIA cards containing the
+ Atmel at76c502 and at76c504 chips.
-config LIBERTAS_THINFIRM_USB
- tristate "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware"
- depends on LIBERTAS_THINFIRM && USB
- ---help---
- A driver for Marvell Libertas 8388 USB devices using thinfirm.
+config AT76C50X_USB
+ tristate "Atmel at76c503/at76c505/at76c505a USB cards"
+ depends on MAC80211 && WLAN_80211 && USB
+ select FW_LOADER
+ ---help---
+ Enable support for USB Wireless devices using Atmel at76c503,
+ at76c505 or at76c505a chips.
-config MWL8K
- tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
- depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
+endif # ATMEL_80211
+
+config BROADCOM_80211
+ bool "Broadcom wireless driver support"
+ depends on WLAN_80211
---help---
- This driver supports Marvell TOPDOG 802.11 wireless cards.
+ This will enable the support for Broadcom wireless drivers. This
+ includes b43 driver and the b43legacy driver.
- To compile this driver as a module, choose M here: the module
- will be called mwl8k. If unsure, say N.
+if BROADCOM_80211
-endif # MARVELL_80211
+source "drivers/net/wireless/b43/Kconfig"
+source "drivers/net/wireless/b43legacy/Kconfig"
+
+endif # BROADCOM_80211
config CISCO_80211
bool "Cisco"
@@ -232,57 +228,20 @@ config AIRO_CS
endif # CISCO_80211
-config ATMEL_80211
- bool "Atmel"
+menuconfig INTEL_80211
+ bool "Intel"
depends on WLAN_80211
---help---
- This will enable the support for Atmel wireless drivers.
-
-if ATMEL_80211
-
-config ATMEL
- tristate "Atmel at76c50x chipset 802.11b support"
- depends on (PCI || PCMCIA) && WLAN_80211
- select WIRELESS_EXT
- select FW_LOADER
- select CRC32
- ---help---
- A driver 802.11b wireless cards based on the Atmel fast-vnet
- chips. This driver supports standard Linux wireless extensions.
-
- Many cards based on this chipset do not have flash memory
- and need their firmware loaded at start-up. If yours is
- one of these, you will need to provide a firmware image
- to be loaded into the card by the driver. The Atmel
- firmware package can be downloaded from
- <http://www.thekelleys.org.uk/atmel>
-
-config PCI_ATMEL
- tristate "Atmel at76c506 PCI cards"
- depends on ATMEL && PCI
- ---help---
- Enable support for PCI and mini-PCI cards containing the
- Atmel at76c506 chip.
+ This will enable the support for Intel wireless drivers. This
+ includes ipw2100, ipw2200, iwl3945, iwlagn, and iwmc3200wifi
-config PCMCIA_ATMEL
- tristate "Atmel at76c502/at76c504 PCMCIA cards"
- depends on ATMEL && PCMCIA
- select WIRELESS_EXT
- select FW_LOADER
- select CRC32
- ---help---
- Enable support for PCMCIA cards containing the
- Atmel at76c502 and at76c504 chips.
+if INTEL_80211
-config AT76C50X_USB
- tristate "Atmel at76c503/at76c505/at76c505a USB cards"
- depends on MAC80211 && WLAN_80211 && USB
- select FW_LOADER
- ---help---
- Enable support for USB Wireless devices using Atmel at76c503,
- at76c505 or at76c505a chips.
+source "drivers/net/wireless/ipw2x00/Kconfig"
+source "drivers/net/wireless/iwlwifi/Kconfig"
+source "drivers/net/wireless/iwmc3200wifi/Kconfig"
-endif # ATMEL_80211
+endif # INTEL_80211
config CONEXANT_ST_80211
bool "Intersil / Conexant / STEricsson"
@@ -347,50 +306,79 @@ config PRISM54
endif # CONEXANT_ST_80211
-config ZYDAS_80211
- bool "ZyDAS"
+menuconfig MARVELL_80211
+ bool "Marvell"
depends on WLAN_80211
---help---
- This will enable the support for ZyDAS wireless drivers. This includes
- the 802.11g zd1211rw usb driver and the older 802.11b zd1201 usb driver.
+ This will enable the support for Marvell wireless drivers. This includes
+ the drivers: libertas, libertas_tf, and mwl8k.
-if ZYDAS_80211
+if MARVELL_80211
+config LIBERTAS
+ tristate "Marvell 8xxx Libertas WLAN driver support"
+ depends on WLAN_80211
+ select WIRELESS_EXT
+ select LIB80211
+ select FW_LOADER
+ ---help---
+ A library for Marvell Libertas 8xxx devices.
-source "drivers/net/wireless/zd1211rw/Kconfig"
+config LIBERTAS_USB
+ tristate "Marvell Libertas 8388 USB 802.11b/g cards"
+ depends on LIBERTAS && USB
+ ---help---
+ A driver for Marvell Libertas 8388 USB devices.
-config USB_ZD1201
- tristate "USB ZD1201 based Wireless device support"
- depends on USB && WLAN_80211
- select WIRELESS_EXT
+config LIBERTAS_CS
+ tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
+ depends on LIBERTAS && PCMCIA
select FW_LOADER
---help---
- Say Y if you want to use wireless LAN adapters based on the ZyDAS
- ZD1201 chip.
+ A driver for Marvell Libertas 8385 CompactFlash devices.
- This driver makes the adapter appear as a normal Ethernet interface,
- typically on wlan0.
+config LIBERTAS_SDIO
+ tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"
+ depends on LIBERTAS && MMC
+ ---help---
+ A driver for Marvell Libertas 8385/8686/8688 SDIO devices.
- The zd1201 device requires external firmware to be loaded.
- This can be found at http://linux-lc100020.sourceforge.net/
+config LIBERTAS_SPI
+ tristate "Marvell Libertas 8686 SPI 802.11b/g cards"
+ depends on LIBERTAS && SPI
+ ---help---
+ A driver for Marvell Libertas 8686 SPI devices.
- To compile this driver as a module, choose M here: the
- module will be called zd1201.
+config LIBERTAS_DEBUG
+ bool "Enable full debugging output in the Libertas module."
+ depends on LIBERTAS
+ ---help---
+ Debugging support.
-endif # ZYDAS_80211
+config LIBERTAS_THINFIRM
+ tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"
+ depends on WLAN_80211 && MAC80211
+ select FW_LOADER
+ ---help---
+ A library for Marvell Libertas 8xxx devices using thinfirm.
-config BROADCOM_80211
- bool "Broadcom"
- depends on WLAN_80211
+config LIBERTAS_THINFIRM_USB
+ tristate "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware"
+ depends on LIBERTAS_THINFIRM && USB
---help---
- This will enable the support for Broadcom wireless drivers. This
- includes b43 driver, b43legacy driver and the rndis_wlan driver.
+ A driver for Marvell Libertas 8388 USB devices using thinfirm.
-if BROADCOM_80211
+config MWL8K
+ tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
+ depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
+ ---help---
+ This driver supports Marvell TOPDOG 802.11 wireless cards.
-source "drivers/net/wireless/b43/Kconfig"
-source "drivers/net/wireless/b43legacy/Kconfig"
+ To compile this driver as a module, choose M here: the module
+ will be called mwl8k. If unsure, say N.
-endif # BROADCOM_80211
+endif # MARVELL_80211
+
+source "drivers/net/wireless/rt2x00/Kconfig"
config REALTEK_80211
bool "Realtek"
@@ -488,24 +476,38 @@ config RTL8187_LEDS
endif # REALTEK_80211
-menuconfig INTEL_80211
- bool "Intel"
+source "drivers/net/wireless/wl12xx/Kconfig"
+
+config ZYDAS_80211
+ bool "ZyDAS"
depends on WLAN_80211
---help---
- This will enable the support for Intel wireless drivers. This
- includes ipw2100, ipw2200, iwl3945, iwlagn, and iwmc3200wifi
+ This will enable the support for ZyDAS wireless drivers. This includes
+ the 802.11g zd1211rw usb driver and the older 802.11b zd1201 usb driver.
-if INTEL_80211
+if ZYDAS_80211
-source "drivers/net/wireless/ipw2x00/Kconfig"
-source "drivers/net/wireless/iwlwifi/Kconfig"
-source "drivers/net/wireless/iwmc3200wifi/Kconfig"
+source "drivers/net/wireless/zd1211rw/Kconfig"
-endif # INTEL_80211
+config USB_ZD1201
+ tristate "USB ZD1201 based Wireless device support"
+ depends on USB && WLAN_80211
+ select WIRELESS_EXT
+ select FW_LOADER
+ ---help---
+ Say Y if you want to use wireless LAN adapters based on the ZyDAS
+ ZD1201 chip.
-source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/rt2x00/Kconfig"
-source "drivers/net/wireless/wl12xx/Kconfig"
+ This driver makes the adapter appear as a normal Ethernet interface,
+ typically on wlan0.
+
+ The zd1201 device requires external firmware to be loaded.
+ This can be found at http://linux-lc100020.sourceforge.net/
+
+ To compile this driver as a module, choose M here: the
+ module will be called zd1201.
+
+endif # ZYDAS_80211
config PCMCIA_RAYCS
tristate "Aviator/Raytheon 2.4GHz wireless support"
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 15/34] wireless: move group drivers together
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
The group drivers are now above, individual drivers below.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 157 +++++++++++++++++++++---------------------
1 files changed, 78 insertions(+), 79 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 82a617d..325d14d 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -110,19 +110,6 @@ menuconfig WLAN_80211
This option does not affect the kernel build, it only
lets you choose drivers.
-config PCMCIA_RAYCS
- tristate "Aviator/Raytheon 2.4GHz wireless support"
- depends on PCMCIA && WLAN_80211
- select WIRELESS_EXT
- ---help---
- Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
- (PC-card) wireless Ethernet networking card to your computer.
- Please read the file <file:Documentation/networking/ray_cs.txt> for
- details.
-
- To compile this driver as a module, choose M here: the module will be
- called ray_cs. If unsure, say N.
-
menuconfig MARVELL_80211
bool "Marvell"
depends on WLAN_80211
@@ -297,15 +284,6 @@ config AT76C50X_USB
endif # ATMEL_80211
-config PCMCIA_WL3501
- tristate "Planet WL3501 PCMCIA cards"
- depends on EXPERIMENTAL && PCMCIA && WLAN_80211
- select WIRELESS_EXT
- ---help---
- A driver for WL3501 PCMCIA 802.11 wireless cards made by Planet.
- It has basic support for Linux wireless extensions and initial
- micro support for ethtool.
-
config CONEXANT_ST_80211
bool "Intersil / Conexant / STEricsson"
depends on WLAN_80211
@@ -400,37 +378,19 @@ config USB_ZD1201
endif # ZYDAS_80211
-config USB_NET_RNDIS_WLAN
- tristate "Wireless RNDIS USB support"
- depends on USB && WLAN_80211 && EXPERIMENTAL
- depends on CFG80211
- select USB_USBNET
- select USB_NET_CDCETHER
- select USB_NET_RNDIS_HOST
- select WIRELESS_EXT
+config BROADCOM_80211
+ bool "Broadcom"
+ depends on WLAN_80211
---help---
- This is a driver for wireless RNDIS devices.
- These are USB based adapters found in devices such as:
+ This will enable the support for Broadcom wireless drivers. This
+ includes b43 driver, b43legacy driver and the rndis_wlan driver.
- Buffalo WLI-U2-KG125S
- U.S. Robotics USR5421
- Belkin F5D7051
- Linksys WUSB54GSv2
- Linksys WUSB54GSC
- Asus WL169gE
- Eminent EM4045
- BT Voyager 1055
- Linksys WUSB54GSv1
- U.S. Robotics USR5420
- BUFFALO WLI-USB-G54
+if BROADCOM_80211
- All of these devices are based on Broadcom 4320 chip which is the
- only wireless RNDIS chip known to date. Technically RNDIS follows
- a Microsoft specification, and although only Broadcom currently
- supports this, other vendors could technically follow the
- implementation as well.
+source "drivers/net/wireless/b43/Kconfig"
+source "drivers/net/wireless/b43legacy/Kconfig"
- If you choose to build a module, it'll be called rndis_wlan.
+endif # BROADCOM_80211
config REALTEK_80211
bool "Realtek"
@@ -528,6 +488,47 @@ config RTL8187_LEDS
endif # REALTEK_80211
+menuconfig INTEL_80211
+ bool "Intel"
+ depends on WLAN_80211
+ ---help---
+ This will enable the support for Intel wireless drivers. This
+ includes ipw2100, ipw2200, iwl3945, iwlagn, and iwmc3200wifi
+
+if INTEL_80211
+
+source "drivers/net/wireless/ipw2x00/Kconfig"
+source "drivers/net/wireless/iwlwifi/Kconfig"
+source "drivers/net/wireless/iwmc3200wifi/Kconfig"
+
+endif # INTEL_80211
+
+source "drivers/net/wireless/ath/Kconfig"
+source "drivers/net/wireless/rt2x00/Kconfig"
+source "drivers/net/wireless/wl12xx/Kconfig"
+
+config PCMCIA_RAYCS
+ tristate "Aviator/Raytheon 2.4GHz wireless support"
+ depends on PCMCIA && WLAN_80211
+ select WIRELESS_EXT
+ ---help---
+ Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
+ (PC-card) wireless Ethernet networking card to your computer.
+ Please read the file <file:Documentation/networking/ray_cs.txt> for
+ details.
+
+ To compile this driver as a module, choose M here: the module will be
+ called ray_cs. If unsure, say N.
+
+config PCMCIA_WL3501
+ tristate "Planet WL3501 PCMCIA cards"
+ depends on EXPERIMENTAL && PCMCIA && WLAN_80211
+ select WIRELESS_EXT
+ ---help---
+ A driver for WL3501 PCMCIA 802.11 wireless cards made by Planet.
+ It has basic support for Linux wireless extensions and initial
+ micro support for ethtool.
+
config ADM8211
tristate "ADMtek ADM8211 support"
depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
@@ -568,41 +569,39 @@ config MAC80211_HWSIM
To compile this driver as a module, choose M here: the module will be
called mac80211_hwsim. If unsure, say N.
-source "drivers/net/wireless/ath/Kconfig"
-
-menuconfig INTEL_80211
- bool "Intel"
- depends on WLAN_80211
- ---help---
- This will enable the support for Intel wireless drivers. This
- includes ipw2100, ipw2200, iwl3945, iwlagn, and iwmc3200wifi
-
-if INTEL_80211
-
-source "drivers/net/wireless/ipw2x00/Kconfig"
-source "drivers/net/wireless/iwlwifi/Kconfig"
-source "drivers/net/wireless/iwmc3200wifi/Kconfig"
-
-endif # INTEL_80211
-
source "drivers/net/wireless/hostap/Kconfig"
+source "drivers/net/wireless/orinoco/Kconfig"
-config BROADCOM_80211
- bool "Broadcom"
- depends on WLAN_80211
+config USB_NET_RNDIS_WLAN
+ tristate "Wireless RNDIS USB support"
+ depends on USB && WLAN_80211 && EXPERIMENTAL
+ depends on CFG80211
+ select USB_USBNET
+ select USB_NET_CDCETHER
+ select USB_NET_RNDIS_HOST
+ select WIRELESS_EXT
---help---
- This will enable the support for Broadcom wireless drivers. This
- includes b43 driver, b43legacy driver and the rndis_wlan driver.
-
-if BROADCOM_80211
+ This is a driver for wireless RNDIS devices.
+ These are USB based adapters found in devices such as:
-source "drivers/net/wireless/b43/Kconfig"
-source "drivers/net/wireless/b43legacy/Kconfig"
+ Buffalo WLI-U2-KG125S
+ U.S. Robotics USR5421
+ Belkin F5D7051
+ Linksys WUSB54GSv2
+ Linksys WUSB54GSC
+ Asus WL169gE
+ Eminent EM4045
+ BT Voyager 1055
+ Linksys WUSB54GSv1
+ U.S. Robotics USR5420
+ BUFFALO WLI-USB-G54
-endif # BROADCOM_80211
+ All of these devices are based on Broadcom 4320 chip which is the
+ only wireless RNDIS chip known to date. Technically RNDIS follows
+ a Microsoft specification, and although only Broadcom currently
+ supports this, other vendors could technically follow the
+ implementation as well.
-source "drivers/net/wireless/rt2x00/Kconfig"
-source "drivers/net/wireless/orinoco/Kconfig"
-source "drivers/net/wireless/wl12xx/Kconfig"
+ If you choose to build a module, it'll be called rndis_wlan.
endmenu
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 14/34] wireless: group Cisco together on kconfig
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
There's only a few of these so we keep them under
a config option which expands upon selection.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index f5d9dba..82a617d 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -195,6 +195,16 @@ config MWL8K
endif # MARVELL_80211
+config CISCO_80211
+ bool "Cisco"
+ depends on WLAN_80211
+ ---help---
+ This will enable the support for Cisco wireless drivers. This
+ includes the Cisco Aironet ISA and PCI drivers and the Cisco
+ Aironet PCMCIA drivers.
+
+if CISCO_80211
+
config AIRO
tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
depends on ISA_DMA_API && WLAN_80211 && (PCI || BROKEN)
@@ -233,6 +243,8 @@ config AIRO_CS
and Cisco proprietary API, so both the Linux Wireless Tools and the
Cisco Linux utilities can be used to configure the card.
+endif # CISCO_80211
+
config ATMEL_80211
bool "Atmel"
depends on WLAN_80211
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 13/34] wireless: move AIRO_CS closer to AIRO_CS
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 32f3203..f5d9dba 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -213,6 +213,26 @@ config AIRO
The driver can be compiled as a module and will be named "airo".
+config AIRO_CS
+ tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
+ depends on PCMCIA && (BROKEN || !M32R) && WLAN_80211
+ select WIRELESS_EXT
+ select CRYPTO
+ select CRYPTO_AES
+ ---help---
+ This is the standard Linux driver to support Cisco/Aironet PCMCIA
+ 802.11 wireless cards. This driver is the same as the Aironet
+ 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
+ supports OEM of Cisco such as the DELL TrueMobile 4800 and Xircom
+ 802.11b cards.
+
+ This driver support both the standard Linux Wireless Extensions
+ and Cisco proprietary API, so both the Linux Wireless Tools and the
+ Cisco Linux utilities can be used to configure the card.
+
config ATMEL_80211
bool "Atmel"
depends on WLAN_80211
@@ -265,26 +285,6 @@ config AT76C50X_USB
endif # ATMEL_80211
-config AIRO_CS
- tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
- depends on PCMCIA && (BROKEN || !M32R) && WLAN_80211
- select WIRELESS_EXT
- select CRYPTO
- select CRYPTO_AES
- ---help---
- This is the standard Linux driver to support Cisco/Aironet PCMCIA
- 802.11 wireless cards. This driver is the same as the Aironet
- 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
- supports OEM of Cisco such as the DELL TrueMobile 4800 and Xircom
- 802.11b cards.
-
- This driver support both the standard Linux Wireless Extensions
- and Cisco proprietary API, so both the Linux Wireless Tools and the
- Cisco Linux utilities can be used to configure the card.
-
config PCMCIA_WL3501
tristate "Planet WL3501 PCMCIA cards"
depends on EXPERIMENTAL && PCMCIA && WLAN_80211
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 12/34] wireless: group Atmel wireless together on kconfig
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
There's only a few of these so we keep them under a config option
which expands upon selection.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 41b0b9a..32f3203 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -213,6 +213,14 @@ config AIRO
The driver can be compiled as a module and will be named "airo".
+config ATMEL_80211
+ bool "Atmel"
+ depends on WLAN_80211
+ ---help---
+ This will enable the support for Atmel wireless drivers.
+
+if ATMEL_80211
+
config ATMEL
tristate "Atmel at76c50x chipset 802.11b support"
depends on (PCI || PCMCIA) && WLAN_80211
@@ -255,6 +263,8 @@ config AT76C50X_USB
Enable support for USB Wireless devices using Atmel at76c503,
at76c505 or at76c505a chips.
+endif # ATMEL_80211
+
config AIRO_CS
tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
depends on PCMCIA && (BROKEN || !M32R) && WLAN_80211
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 11/34] wireless: clarify rndis_wlan is not broadcom specific
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville
Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Michael Buesch,
Gábor Stefanik, Johannes Berg, Jussi Kivilinna
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
Cc: Michael Buesch <mb@bu3sch.de>
Cc: Gábor Stefanik <netrolller.3d@gmail.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 150565d..41b0b9a 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -403,7 +403,10 @@ config USB_NET_RNDIS_WLAN
BUFFALO WLI-USB-G54
All of these devices are based on Broadcom 4320 chip which is the
- only wireless RNDIS chip known to date.
+ only wireless RNDIS chip known to date. Technically RNDIS follows
+ a Microsoft specification, and although only Broadcom currently
+ supports this, other vendors could technically follow the
+ implementation as well.
If you choose to build a module, it'll be called rndis_wlan.
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 10/34] wireless: group Broadcom drivers on kconfig
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville
Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Michael Buesch,
Gábor Stefanik, Johannes Berg
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
This moves Broadcom wireless drivers into their own menu.
There are only 2 Broadcom specific drivers so we group
them into a menu which can expand. Although rndis_wlan
also supports Broadcom devices, RNDIS is a spec and other
vendors could technically implement solutions with it
as well so we keep that separate as users most likely
won't look for those devices under a Broadcom tag.
Cc: Michael Buesch <mb@bu3sch.de>
Cc: Gábor Stefanik <netrolller.3d@gmail.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index c2e88dc..150565d 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -561,8 +561,21 @@ source "drivers/net/wireless/iwmc3200wifi/Kconfig"
endif # INTEL_80211
source "drivers/net/wireless/hostap/Kconfig"
+
+config BROADCOM_80211
+ bool "Broadcom"
+ depends on WLAN_80211
+ ---help---
+ This will enable the support for Broadcom wireless drivers. This
+ includes b43 driver, b43legacy driver and the rndis_wlan driver.
+
+if BROADCOM_80211
+
source "drivers/net/wireless/b43/Kconfig"
source "drivers/net/wireless/b43legacy/Kconfig"
+
+endif # BROADCOM_80211
+
source "drivers/net/wireless/rt2x00/Kconfig"
source "drivers/net/wireless/orinoco/Kconfig"
source "drivers/net/wireless/wl12xx/Kconfig"
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 09/34] wireless: group Realtek wireless on kconfig
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
There's only a few of these so we keep them under a config option
which expands upon selection.
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index a04ca56..c2e88dc 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -407,6 +407,15 @@ config USB_NET_RNDIS_WLAN
If you choose to build a module, it'll be called rndis_wlan.
+config REALTEK_80211
+ bool "Realtek"
+ depends on WLAN_80211
+ ---help---
+ This will enable the support for Realtek wireless drivers. This includes
+ the PCI rtl8180 driver and the USB rtl8187 driver.
+
+if REALTEK_80211
+
config RTL8180
tristate "Realtek 8180/8185 PCI support"
depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
@@ -492,6 +501,8 @@ config RTL8187_LEDS
depends on RTL8187 && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = RTL8187)
default y
+endif # REALTEK_80211
+
config ADM8211
tristate "ADMtek ADM8211 support"
depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 08/34] wireless: group ZyDAS wireless drivers in kconfig
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville
Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Daniel Drake,
Stephen Chen
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
There's only a few of these so we keep them under a config option
which expands upon selection.
Cc: Daniel Drake <dsd@gentoo.org>
Cc: Stephen Chen <stephen.chen@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 9f1b5b6..a04ca56 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -347,6 +347,15 @@ config PRISM54
endif # CONEXANT_ST_80211
+config ZYDAS_80211
+ bool "ZyDAS"
+ depends on WLAN_80211
+ ---help---
+ This will enable the support for ZyDAS wireless drivers. This includes
+ the 802.11g zd1211rw usb driver and the older 802.11b zd1201 usb driver.
+
+if ZYDAS_80211
+
source "drivers/net/wireless/zd1211rw/Kconfig"
config USB_ZD1201
@@ -367,6 +376,8 @@ config USB_ZD1201
To compile this driver as a module, choose M here: the
module will be called zd1201.
+endif # ZYDAS_80211
+
config USB_NET_RNDIS_WLAN
tristate "Wireless RNDIS USB support"
depends on USB && WLAN_80211 && EXPERIMENTAL
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 07/34] wireless: move zd1211rw option closer to old ZyDAS on kconfig
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville
Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Daniel Drake,
Stephen Chen
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
Cc: Daniel Drake <dsd@gentoo.org>
Cc: Stephen Chen <stephen.chen@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index a123f6e..9f1b5b6 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -347,6 +347,8 @@ config PRISM54
endif # CONEXANT_ST_80211
+source "drivers/net/wireless/zd1211rw/Kconfig"
+
config USB_ZD1201
tristate "USB ZD1201 based Wireless device support"
depends on USB && WLAN_80211
@@ -539,7 +541,6 @@ endif # INTEL_80211
source "drivers/net/wireless/hostap/Kconfig"
source "drivers/net/wireless/b43/Kconfig"
source "drivers/net/wireless/b43legacy/Kconfig"
-source "drivers/net/wireless/zd1211rw/Kconfig"
source "drivers/net/wireless/rt2x00/Kconfig"
source "drivers/net/wireless/orinoco/Kconfig"
source "drivers/net/wireless/wl12xx/Kconfig"
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 06/34] wireless: group Conexant / STEricsson drivers in kconfig
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville
Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez,
Christian Lamparter, Kalle Valo
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
There's only a few of these so we keep them under a
config option which expands upon selection.
Cc: Christian Lamparter <chunkeey@web.de>
Cc: Kalle Valo <kalle.valo@nokia.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index cfd192e..a123f6e 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -284,6 +284,18 @@ config PCMCIA_WL3501
It has basic support for Linux wireless extensions and initial
micro support for ethtool.
+config CONEXANT_ST_80211
+ bool "Intersil / Conexant / STEricsson"
+ depends on WLAN_80211
+ ---help---
+ This will enable the support for Intersil / Conexant and STEricsson
+ wireless drivers. All these companies have sell wireless cards which
+ have shared common parts one way or another. The drivers for these cards
+ include the mac80211 based p54 drivers for PCI, USB and SPI (Nokia N810
+ and N800), and and the old PCI FullMAC driver prism54.
+
+if CONEXANT_ST_80211
+
source "drivers/net/wireless/p54/Kconfig"
config PRISM54
@@ -333,6 +345,8 @@ config PRISM54
say M here and read <file:Documentation/kbuild/modules.txt>.
The module will be called prism54.
+endif # CONEXANT_ST_80211
+
config USB_ZD1201
tristate "USB ZD1201 based Wireless device support"
depends on USB && WLAN_80211
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 05/34] wireless: move p54 and prism54 drivers closer on kconfig
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville
Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez,
Christian Lamparter
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
Cc: Christian Lamparter <chunkeey@web.de>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index fdf0257..cfd192e 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -284,6 +284,8 @@ config PCMCIA_WL3501
It has basic support for Linux wireless extensions and initial
micro support for ethtool.
+source "drivers/net/wireless/p54/Kconfig"
+
config PRISM54
tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus'
depends on PCI && EXPERIMENTAL && WLAN_80211
@@ -503,7 +505,6 @@ config MAC80211_HWSIM
To compile this driver as a module, choose M here: the module will be
called mac80211_hwsim. If unsure, say N.
-source "drivers/net/wireless/p54/Kconfig"
source "drivers/net/wireless/ath/Kconfig"
menuconfig INTEL_80211
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 03/34] wireless: move MWL8K right below libertas on kconfig
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index ab7a185..abb6930 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -176,6 +176,15 @@ config LIBERTAS_THINFIRM_USB
---help---
A driver for Marvell Libertas 8388 USB devices using thinfirm.
+config MWL8K
+ tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
+ depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
+ ---help---
+ This driver supports Marvell TOPDOG 802.11 wireless cards.
+
+ To compile this driver as a module, choose M here: the module
+ will be called mwl8k. If unsure, say N.
+
config AIRO
tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
depends on ISA_DMA_API && WLAN_80211 && (PCI || BROKEN)
@@ -484,15 +493,6 @@ config MAC80211_HWSIM
To compile this driver as a module, choose M here: the module will be
called mac80211_hwsim. If unsure, say N.
-config MWL8K
- tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
- depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
- ---help---
- This driver supports Marvell TOPDOG 802.11 wireless cards.
-
- To compile this driver as a module, choose M here: the module
- will be called mwl8k. If unsure, say N.
-
source "drivers/net/wireless/p54/Kconfig"
source "drivers/net/wireless/ath/Kconfig"
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 02/34] wireless: group intel wireless drivers on kconfig
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville
Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Zhu Yi,
Wey-Yi Guy, Samuel Ortiz, Reinette Chatre
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
This moves intel wireless drivers into their own menu.
Intel drivers are plenty and so are their driver options so we
give them its own menuconfig.
Cc: Zhu Yi <yi.zhu@intel.com>
Cc: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Cc: Samuel Ortiz <samuel.ortiz@intel.com>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 72dbac6..ab7a185 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -495,9 +495,22 @@ config MWL8K
source "drivers/net/wireless/p54/Kconfig"
source "drivers/net/wireless/ath/Kconfig"
+
+menuconfig INTEL_80211
+ bool "Intel"
+ depends on WLAN_80211
+ ---help---
+ This will enable the support for Intel wireless drivers. This
+ includes ipw2100, ipw2200, iwl3945, iwlagn, and iwmc3200wifi
+
+if INTEL_80211
+
source "drivers/net/wireless/ipw2x00/Kconfig"
source "drivers/net/wireless/iwlwifi/Kconfig"
source "drivers/net/wireless/iwmc3200wifi/Kconfig"
+
+endif # INTEL_80211
+
source "drivers/net/wireless/hostap/Kconfig"
source "drivers/net/wireless/b43/Kconfig"
source "drivers/net/wireless/b43legacy/Kconfig"
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 01/34] wireless: move iwmc3200wifi closer to the other intel drivers
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville
Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Zhu Yi,
Wey-Yi Guy, Samuel Ortiz, Reinette Chatre
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
Cc: Zhu Yi <yi.zhu@intel.com>
Cc: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Cc: Samuel Ortiz <samuel.ortiz@intel.com>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index dda7cc2..72dbac6 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -497,6 +497,7 @@ source "drivers/net/wireless/p54/Kconfig"
source "drivers/net/wireless/ath/Kconfig"
source "drivers/net/wireless/ipw2x00/Kconfig"
source "drivers/net/wireless/iwlwifi/Kconfig"
+source "drivers/net/wireless/iwmc3200wifi/Kconfig"
source "drivers/net/wireless/hostap/Kconfig"
source "drivers/net/wireless/b43/Kconfig"
source "drivers/net/wireless/b43legacy/Kconfig"
@@ -504,6 +505,5 @@ source "drivers/net/wireless/zd1211rw/Kconfig"
source "drivers/net/wireless/rt2x00/Kconfig"
source "drivers/net/wireless/orinoco/Kconfig"
source "drivers/net/wireless/wl12xx/Kconfig"
-source "drivers/net/wireless/iwmc3200wifi/Kconfig"
endmenu
--
1.6.2.5
^ permalink raw reply related
* [PATCH v4 00/34] wireless: update/re-arrange kconfigs
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
Here is the 4th iteration of this series (3rd one was
just some two small updates). I made a change which did require
rebasing the others so just sending a new series. This is also
now rebased on today's wireless testing.
This series incorporates the changes made by Gabor and Luciano.
I've also expanded this and updated the net/wireless/Kconfig,
net/mac80211/Kconfig, the top level description for Wireless LAN
and made some more changes talked about on IRC for prism54.ko.
The only other thing left which I feel could use some updating
is the rate control selection for mac80211. I am able to select
only minstrel as the default. I believe this should not even be
visible if that is the default. Also did we really plan for
PID to be only selectable if embedded? IIRC I was able to build
it last only when selecting embedded. Anyway we can enhance
this if needed later.
Holger asked for a uni-bomb patch, here it is, for your convenience:
http://bombadil.infradead.org/~mcgrof/patches/wireless/2009/08/08-14-wireless-kconfig-all.patch
You can just git am that one file on top of today's wireless-testing.
Luis R. Rodriguez (34):
wireless: move iwmc3200wifi closer to the other intel drivers
wireless: group intel wireless drivers on kconfig
wireless: move MWL8K right below libertas on kconfig
wireless: group Marvell wireless in kconfig
wireless: move p54 and prism54 drivers closer on kconfig
wireless: group Conexant / STEricsson drivers in kconfig
wireless: move zd1211rw option closer to old ZyDAS on kconfig
wireless: group ZyDAS wireless drivers in kconfig
wireless: group Realtek wireless on kconfig
wireless: group Broadcom drivers on kconfig
wireless: clarify rndis_wlan is not broadcom specific
wireless: group Atmel wireless together on kconfig
wireless: move AIRO_CS closer to AIRO_CS
wireless: group Cisco together on kconfig
wireless: move group drivers together
wireless: organize group drivers alphabetically
wireless: remove IEEE 802.11 description on hostapd
wireless: move mac80211_hwsim to top level wireless driver menu
wireless: organize individual drivers alphabetically
wireless: simplify WLAN_PRE80211 entries
wireless: simplify WLAN_80211 entries
wireless: remove "Wireless" from rndis kconfig entry
wireless: downgrade TI driver from menuconfig to config
wireless: Update TI kconfig description
wireless: make ath consistent with the other groups
wireless: update top level wireless driver entry
wireless: update wireless kconfig description
wireless: update cfg80211 kconfig entry
wireless: update reg debug kconfig entry
wireless: update WIRELESS_EXT kconfig entry
wireless: update mac80211 kconfig entry
wireless: make mac80211 select cfg80211
wireless: remove mac80211 rate selection extra menu
wireless: mark prism54.ko as deprecated and mark for removal
Documentation/feature-removal-schedule.txt | 29 ++
drivers/net/wireless/Kconfig | 522 ++++++++++++++++------------
drivers/net/wireless/ath/Kconfig | 3 +-
drivers/net/wireless/ath/ar9170/Kconfig | 2 +-
drivers/net/wireless/ath/ath5k/Kconfig | 2 +-
drivers/net/wireless/ath/ath9k/Kconfig | 2 +-
drivers/net/wireless/b43/Kconfig | 2 +-
drivers/net/wireless/b43legacy/Kconfig | 2 +-
drivers/net/wireless/hostap/Kconfig | 3 +-
drivers/net/wireless/ipw2x00/Kconfig | 6 +-
drivers/net/wireless/iwlwifi/Kconfig | 2 +-
drivers/net/wireless/iwmc3200wifi/Kconfig | 2 +-
drivers/net/wireless/orinoco/Kconfig | 2 +-
drivers/net/wireless/p54/Kconfig | 2 +-
drivers/net/wireless/rt2x00/Kconfig | 2 +-
drivers/net/wireless/wl12xx/Kconfig | 13 +-
drivers/net/wireless/zd1211rw/Kconfig | 2 +-
net/Kconfig | 8 +-
net/mac80211/Kconfig | 32 ++-
net/wireless/Kconfig | 32 ++-
20 files changed, 414 insertions(+), 256 deletions(-)
^ permalink raw reply
* Re: [PATCH] b43: Add LP-PHY firmware loading support
From: Gábor Stefanik @ 2009-08-14 20:20 UTC (permalink / raw)
To: Michael Buesch
Cc: John Linville, Larry Finger, Mark Huijgen, Broadcom Wireless,
linux-wireless
In-Reply-To: <200908142217.40004.mb@bu3sch.de>
2009/8/14 Michael Buesch <mb@bu3sch.de>:
> On Friday 14 August 2009 13:51:59 Gábor Stefanik wrote:
>> Add support for loading LP-PHY firmware to b43_try_request_fw.
>>
>> Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
>
> ack
> --
> Greetings, Michael.
>
This version is broken - ack "v3 this time really" instead.
--
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)
^ permalink raw reply
* Re: [PATCH] b43: Add LP-PHY firmware loading support
From: Michael Buesch @ 2009-08-14 20:17 UTC (permalink / raw)
To: Gábor Stefanik
Cc: John Linville, Larry Finger, Mark Huijgen, Broadcom Wireless,
linux-wireless
In-Reply-To: <4A854FDF.5020208@gmail.com>
On Friday 14 August 2009 13:51:59 Gábor Stefanik wrote:
> Add support for loading LP-PHY firmware to b43_try_request_fw.
>
> Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
ack
--
Greetings, Michael.
^ permalink raw reply
* Re: [PATCH] b43: LP-PHY: Implement channel switching for rev0/1/B2062 radio
From: Michael Buesch @ 2009-08-14 20:16 UTC (permalink / raw)
To: Gábor Stefanik
Cc: John Linville, Larry Finger, Broadcom Wireless, linux-wireless
In-Reply-To: <4A849075.7000000@gmail.com>
On Friday 14 August 2009 00:15:17 Gábor Stefanik wrote:
> -Move pdiv from lpphy_2062_init to struct b43_phy_lp.
> -Add channel table for the B2062 radio.
> -Add code for tuning the B2062 radio to channel.
> -Add error handling to op_switch_channel, and use it for both radios.
>
> Rev0/1/B2062 will now hopefully show some signs of life, though
> it won't work at full performance, as calibration is still missing.
>
> Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
ack
--
Greetings, Michael.
^ permalink raw reply
* Re: [PATCH] b43: LP-PHY: Implement channel switching for rev2+/B2063 radio
From: Michael Buesch @ 2009-08-14 20:16 UTC (permalink / raw)
To: Gábor Stefanik
Cc: John Linville, Larry Finger, Broadcom Wireless, linux-wireless
In-Reply-To: <4A847BA6.30803@gmail.com>
On Thursday 13 August 2009 22:46:30 Gábor Stefanik wrote:
> Rev.2+/B2063 will now hopefully show some signs of life, though
> it won't work at full performance, as calibration is still missing.
>
> Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
ack
--
Greetings, Michael.
^ permalink raw reply
* Re: [PATCH] b43: Fix sparse warnings
From: Michael Buesch @ 2009-08-14 20:15 UTC (permalink / raw)
To: Larry Finger; +Cc: John W Linville, bcm43xx-dev, linux-wireless
In-Reply-To: <4a84906b.+IYGhiNLKPSjrrR7%Larry.Finger@lwfinger.net>
On Friday 14 August 2009 00:15:07 Larry Finger wrote:
> The b43 driver generates the following sparse warnings:
>
> CHECK drivers/net/wireless/b43/phy_g.c
> drivers/net/wireless/b43/phy_g.c:974:35: warning: cast truncates bits from constant value (ffff7fff becomes 7fff)
> CHECK drivers/net/wireless/b43/wa.c
> drivers/net/wireless/b43/wa.c:385:53: warning: cast truncates bits from constant value (ffff00ff becomes ff)
> drivers/net/wireless/b43/wa.c:403:48: warning: cast truncates bits from constant value (ffff00ff becomes ff)
> drivers/net/wireless/b43/wa.c:405:48: warning: cast truncates bits from constant value (ffff00ff becomes ff)
> drivers/net/wireless/b43/wa.c:415:50: warning: cast truncates bits from constant value (ffff0fff becomes fff)
>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> ---
>
> John,
>
> There is no hurry for this material.
>
> Larry
> ---
>
> Index: wireless-testing/drivers/net/wireless/b43/phy_g.c
> ===================================================================
> --- wireless-testing.orig/drivers/net/wireless/b43/phy_g.c
> +++ wireless-testing/drivers/net/wireless/b43/phy_g.c
> @@ -971,7 +971,7 @@ b43_radio_interference_mitigation_enable
> b43_phy_maskset(dev, 0x04A2, 0xFFF0, 0x000B);
>
> if (phy->rev >= 3) {
> - b43_phy_mask(dev, 0x048A, (u16)~0x8000);
> + b43_phy_mask(dev, 0x048A, (u16)(~0x8000 & 0xFFFF));
Uh come on...
The u16 cast already is stupid as hell, but this is becoming braindead.
The code is perfectly fine. Sparse should instead provide an option to disable
this fragile check.
--
Greetings, Michael.
^ permalink raw reply
* [PATCH] b43: LP-PHY: Update TX gain override for a spec typo fix
From: Gábor Stefanik @ 2009-08-14 20:10 UTC (permalink / raw)
To: John Linville, Michael Buesch, Larry Finger
Cc: Mark Huijgen, Broadcom Wireless, linux-wireless
Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
---
drivers/net/wireless/b43/phy_lp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
index 558224b..bf89173 100644
--- a/drivers/net/wireless/b43/phy_lp.c
+++ b/drivers/net/wireless/b43/phy_lp.c
@@ -747,7 +747,7 @@ static void lpphy_set_tx_gains(struct b43_wldev *dev,
b43_phy_maskset(dev, B43_LPPHY_RF_OVERRIDE_2, 0xFF7F, 1 << 7);
b43_phy_maskset(dev, B43_LPPHY_RF_OVERRIDE_2, 0xBFFF, 1 << 14);
}
- b43_phy_maskset(dev, B43_LPPHY_RF_OVERRIDE_2, 0xFFBF, 1 << 4);
+ b43_phy_maskset(dev, B43_LPPHY_RF_OVERRIDE_2, 0xFFBF, 1 << 6);
}
static void lpphy_rev0_1_set_rx_gain(struct b43_wldev *dev, u32 gain)
--
1.6.2.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox