[PATCH v4 00/34] wireless: update/re-arrange kconfigs

[PATCH v4 00/34] wireless: update/re-arrange kconfigs

[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(-)

[PATCH v4 01/34] wireless: move iwmc3200wifi closer to the other intel drivers

[Luis R. Rodriguez]

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

[PATCH v4 02/34] wireless: group intel wireless drivers on kconfig

[Luis R. Rodriguez]

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

[PATCH v4 03/34] wireless: move MWL8K right below libertas on kconfig

[Luis R. Rodriguez]

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

[PATCH v4 05/34] wireless: move p54 and prism54 drivers closer on kconfig

[Luis R. Rodriguez]

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

[PATCH v4 06/34] wireless: group Conexant / STEricsson drivers in kconfig

[Luis R. Rodriguez]

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

[PATCH v4 07/34] wireless: move zd1211rw option closer to old ZyDAS on kconfig

[Luis R. Rodriguez]

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

[PATCH v4 08/34] wireless: group ZyDAS wireless drivers in kconfig

[Luis R. Rodriguez]

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

[PATCH v4 09/34] wireless: group Realtek wireless on kconfig

[Luis R. Rodriguez]

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

[PATCH v4 10/34] wireless: group Broadcom drivers on kconfig

[Luis R. Rodriguez]

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

[PATCH v4 11/34] wireless: clarify rndis_wlan is not broadcom specific

[Luis R. Rodriguez]

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

[PATCH v4 12/34] wireless: group Atmel wireless together on kconfig

[Luis R. Rodriguez]

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

[PATCH v4 13/34] wireless: move AIRO_CS closer to AIRO_CS

[Luis R. Rodriguez]

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

[PATCH v4 14/34] wireless: group Cisco together on kconfig

[Luis R. Rodriguez]

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

[PATCH v4 15/34] wireless: move group drivers together

[Luis R. Rodriguez]

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

[PATCH v4 16/34] wireless: organize group drivers alphabetically

[Luis R. Rodriguez]

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

[PATCH v4 17/34] wireless: remove IEEE 802.11 description on hostapd

[Luis R. Rodriguez]

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

[PATCH v4 18/34] wireless: move mac80211_hwsim to top level wireless driver menu

[Luis R. Rodriguez]

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

[PATCH v4 19/34] wireless: organize individual drivers alphabetically

[Luis R. Rodriguez]

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

[PATCH v4 20/34] wireless: simplify WLAN_PRE80211 entries

[Luis R. Rodriguez]

We do simplify them by ifdef'ing on WLAN_PRE80211 for
the WLAN_PRE80211 drivers, this removes the need to depend
on WLAN_PRE80211 on each individual driver.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 drivers/net/wireless/Kconfig |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 583eddc..f340713 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -14,9 +14,11 @@ menuconfig WLAN_PRE80211
 	  This option does not affect the kernel build, it only
 	  lets you choose drivers.
 
+if WLAN_PRE80211
+
 config ARLAN
 	tristate "Aironet Arlan 655 & IC2200 DS support"
-	depends on ISA && !64BIT && WLAN_PRE80211
+	depends on ISA && !64BIT
 	select WIRELESS_EXT
 	---help---
 	  Aironet makes Arlan, a class of wireless LAN adapters. These use the
@@ -32,7 +34,7 @@ config ARLAN
 
 config WAVELAN
 	tristate "AT&T/Lucent old WaveLAN & DEC RoamAbout DS ISA support"
-	depends on ISA && WLAN_PRE80211
+	depends on ISA
 	select WIRELESS_EXT
 	---help---
 	  The Lucent WaveLAN (formerly NCR and AT&T; or DEC RoamAbout DS) is
@@ -55,7 +57,7 @@ config WAVELAN
 
 config PCMCIA_WAVELAN
 	tristate "AT&T/Lucent old WaveLAN Pcmcia wireless support"
-	depends on PCMCIA && WLAN_PRE80211
+	depends on PCMCIA
 	select WIRELESS_EXT
 	help
 	  Say Y here if you intend to attach an AT&T/Lucent Wavelan PCMCIA
@@ -67,7 +69,7 @@ config PCMCIA_WAVELAN
 
 config STRIP
 	tristate "STRIP (Metricom starmode radio IP)"
-	depends on INET && WLAN_PRE80211
+	depends on INET
 	select WIRELESS_EXT
 	---help---
 	  Say Y if you have a Metricom radio and intend to use Starmode Radio
@@ -91,7 +93,7 @@ config STRIP
 
 config PCMCIA_NETWAVE
 	tristate "Xircom Netwave AirSurfer Pcmcia wireless support"
-	depends on PCMCIA && WLAN_PRE80211
+	depends on PCMCIA
 	select WIRELESS_EXT
 	help
 	  Say Y here if you intend to attach this type of PCMCIA (PC-card)
@@ -100,6 +102,8 @@ config PCMCIA_NETWAVE
 	  To compile this driver as a module, choose M here: the module will be
 	  called netwave_cs.  If unsure, say N.
 
+endif # WLAN_PRE80211
+
 menuconfig WLAN_80211
 	bool "Wireless LAN (IEEE 802.11)"
 	depends on NETDEVICES
-- 
1.6.2.5

[PATCH v4 21/34] wireless: simplify WLAN_80211 entries

[Luis R. Rodriguez]

We do simplify them by ifdef'ing on WLAN_80211 for
the WLAN_80211 drivers, this removes the need to depend
on WLAN_80211 on each individual driver.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 drivers/net/wireless/Kconfig              |   41 ++++++++++++----------------
 drivers/net/wireless/ath/Kconfig          |    1 -
 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       |    1 -
 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       |    2 +-
 drivers/net/wireless/zd1211rw/Kconfig     |    2 +-
 16 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index f340713..9fc1f4f 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -113,11 +113,12 @@ menuconfig WLAN_80211
 	  This option does not affect the kernel build, it only
 	  lets you choose drivers.
 
+if WLAN_80211
+
 source "drivers/net/wireless/ath/Kconfig"
 
 config ATMEL_80211
 	bool "Atmel"
-	depends on WLAN_80211
 	---help---
 	  This will enable the support for Atmel wireless drivers.
 
@@ -125,7 +126,7 @@ if ATMEL_80211
 
 config ATMEL
       tristate "Atmel at76c50x chipset  802.11b support"
-      depends on (PCI || PCMCIA) && WLAN_80211
+      depends on (PCI || PCMCIA)
       select WIRELESS_EXT
       select FW_LOADER
       select CRC32
@@ -159,7 +160,7 @@ config PCMCIA_ATMEL
 
 config AT76C50X_USB
         tristate "Atmel at76c503/at76c505/at76c505a USB cards"
-        depends on MAC80211 && WLAN_80211 && USB
+        depends on MAC80211 && USB
         select FW_LOADER
         ---help---
           Enable support for USB Wireless devices using Atmel at76c503,
@@ -169,7 +170,6 @@ endif # ATMEL_80211
 
 config BROADCOM_80211
 	bool "Broadcom wireless driver support"
-	depends on WLAN_80211
 	---help---
 	  This will enable the support for Broadcom wireless drivers. This
 	  includes b43 driver and the b43legacy driver.
@@ -183,7 +183,6 @@ endif # BROADCOM_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
@@ -193,7 +192,7 @@ 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)
+	depends on ISA_DMA_API && (PCI || BROKEN)
 	select WIRELESS_EXT
 	select CRYPTO
 	---help---
@@ -211,7 +210,7 @@ config AIRO
 
 config AIRO_CS
 	tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
-	depends on PCMCIA && (BROKEN || !M32R) && WLAN_80211
+	depends on PCMCIA && (BROKEN || !M32R)
 	select WIRELESS_EXT
 	select CRYPTO
 	select CRYPTO_AES
@@ -233,7 +232,6 @@ endif # CISCO_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
@@ -248,7 +246,6 @@ endif # INTEL_80211
 
 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
@@ -262,7 +259,7 @@ source "drivers/net/wireless/p54/Kconfig"
 
 config PRISM54
 	tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus' 
-	depends on PCI && EXPERIMENTAL && WLAN_80211
+	depends on PCI && EXPERIMENTAL
 	select WIRELESS_EXT
 	select FW_LOADER
 	---help---
@@ -311,7 +308,6 @@ endif # CONEXANT_ST_80211
 
 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.
@@ -319,7 +315,6 @@ menuconfig MARVELL_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
@@ -359,7 +354,7 @@ config LIBERTAS_DEBUG
 
 config LIBERTAS_THINFIRM
 	tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"
-	depends on WLAN_80211 && MAC80211
+	depends on MAC80211
 	select FW_LOADER
 	---help---
 	  A library for Marvell Libertas 8xxx devices using thinfirm.
@@ -372,7 +367,7 @@ config LIBERTAS_THINFIRM_USB
 
 config MWL8K
 	tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
-	depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
+	depends on MAC80211 && PCI && EXPERIMENTAL
 	---help---
 	  This driver supports Marvell TOPDOG 802.11 wireless cards.
 
@@ -385,7 +380,6 @@ source "drivers/net/wireless/rt2x00/Kconfig"
 
 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.
@@ -394,7 +388,7 @@ if REALTEK_80211
 
 config RTL8180
 	tristate "Realtek 8180/8185 PCI support"
-	depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
+	depends on MAC80211 && PCI && EXPERIMENTAL
 	select EEPROM_93CX6
 	---help---
 	  This is a driver for RTL8180 and RTL8185 based cards.
@@ -450,7 +444,7 @@ config RTL8180
 
 config RTL8187
 	tristate "Realtek 8187 and 8187B USB support"
-	depends on MAC80211 && USB && WLAN_80211
+	depends on MAC80211 && USB
 	select EEPROM_93CX6
 	---help---
 	  This is a driver for RTL8187 and RTL8187B based cards.
@@ -483,7 +477,6 @@ source "drivers/net/wireless/wl12xx/Kconfig"
 
 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.
@@ -494,7 +487,7 @@ source "drivers/net/wireless/zd1211rw/Kconfig"
 
 config USB_ZD1201
 	tristate "USB ZD1201 based Wireless device support"
-	depends on USB && WLAN_80211
+	depends on USB
 	select WIRELESS_EXT
 	select FW_LOADER
 	---help---
@@ -514,7 +507,7 @@ endif # ZYDAS_80211
 
 config ADM8211
 	tristate "ADMtek ADM8211 support"
-	depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
+	depends on MAC80211 && PCI && EXPERIMENTAL
 	select CRC32
 	select EEPROM_93CX6
 	---help---
@@ -541,7 +534,7 @@ config ADM8211
 
 config PCMCIA_RAYCS
 	tristate "Aviator/Raytheon 2.4GHz wireless support"
-	depends on PCMCIA && WLAN_80211
+	depends on PCMCIA
 	select WIRELESS_EXT
 	---help---
 	  Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
@@ -557,7 +550,7 @@ source "drivers/net/wireless/hostap/Kconfig"
 
 config PCMCIA_WL3501
       tristate "Planet WL3501 PCMCIA cards"
-      depends on EXPERIMENTAL && PCMCIA && WLAN_80211
+      depends on EXPERIMENTAL && PCMCIA
       select WIRELESS_EXT
        ---help---
          A driver for WL3501 PCMCIA 802.11 wireless cards made by Planet.
@@ -566,7 +559,7 @@ config PCMCIA_WL3501
 
 config USB_NET_RNDIS_WLAN
 	tristate "Wireless RNDIS USB support"
-	depends on USB && WLAN_80211 && EXPERIMENTAL
+	depends on USB && EXPERIMENTAL
 	depends on CFG80211
 	select USB_USBNET
 	select USB_NET_CDCETHER
@@ -596,6 +589,8 @@ config USB_NET_RNDIS_WLAN
 
 	  If you choose to build a module, it'll be called rndis_wlan.
 
+endif # WLAN_80211
+
 config MAC80211_HWSIM
 	tristate "Simulated radio testing tool for mac80211"
 	depends on MAC80211
diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig
index 11ded15..9bfa909 100644
--- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@ -1,6 +1,5 @@
 menuconfig ATH_COMMON
 	tristate "Atheros Wireless Cards"
-	depends on WLAN_80211
 	depends on CFG80211
 	---help---
 	  This will enable the support for the Atheros wireless drivers.
diff --git a/drivers/net/wireless/ath/ar9170/Kconfig b/drivers/net/wireless/ath/ar9170/Kconfig
index 05918f1..d7a4799 100644
--- a/drivers/net/wireless/ath/ar9170/Kconfig
+++ b/drivers/net/wireless/ath/ar9170/Kconfig
@@ -1,6 +1,6 @@
 config AR9170_USB
 	tristate "Atheros AR9170 802.11n USB support"
-	depends on USB && MAC80211 && WLAN_80211
+	depends on USB && MAC80211
 	select FW_LOADER
 	help
 	  This is a driver for the Atheros "otus" 802.11n USB devices.
diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig
index 06d0066..eb83b7b 100644
--- a/drivers/net/wireless/ath/ath5k/Kconfig
+++ b/drivers/net/wireless/ath/ath5k/Kconfig
@@ -1,6 +1,6 @@
 config ATH5K
 	tristate "Atheros 5xxx wireless cards support"
-	depends on PCI && MAC80211 && WLAN_80211
+	depends on PCI && MAC80211
 	select MAC80211_LEDS
 	select LEDS_CLASS
 	select NEW_LEDS
diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig
index ef5f59c..b9cb095 100644
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@ -1,6 +1,6 @@
 config ATH9K
 	tristate "Atheros 802.11n wireless cards support"
-	depends on PCI && MAC80211 && WLAN_80211
+	depends on PCI && MAC80211
 	select MAC80211_LEDS
 	select LEDS_CLASS
 	select NEW_LEDS
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index 67f564e..79f2fac 100644
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -1,6 +1,6 @@
 config B43
 	tristate "Broadcom 43xx wireless support (mac80211 stack)"
-	depends on SSB_POSSIBLE && MAC80211 && WLAN_80211 && HAS_DMA
+	depends on SSB_POSSIBLE && MAC80211 && HAS_DMA
 	select SSB
 	select FW_LOADER
 	---help---
diff --git a/drivers/net/wireless/b43legacy/Kconfig b/drivers/net/wireless/b43legacy/Kconfig
index 94a4634..1ffa288 100644
--- a/drivers/net/wireless/b43legacy/Kconfig
+++ b/drivers/net/wireless/b43legacy/Kconfig
@@ -1,6 +1,6 @@
 config B43LEGACY
 	tristate "Broadcom 43xx-legacy wireless support (mac80211 stack)"
-	depends on SSB_POSSIBLE && MAC80211 && WLAN_80211 && HAS_DMA
+	depends on SSB_POSSIBLE && MAC80211 && HAS_DMA
 	select SSB
 	select FW_LOADER
 	---help---
diff --git a/drivers/net/wireless/hostap/Kconfig b/drivers/net/wireless/hostap/Kconfig
index 13d074e..f5f9ace 100644
--- a/drivers/net/wireless/hostap/Kconfig
+++ b/drivers/net/wireless/hostap/Kconfig
@@ -1,6 +1,5 @@
 config HOSTAP
 	tristate "Host AP (Prism2/2.5/3 and WEP/TKIP/CCMP)"
-	depends on WLAN_80211
 	select WIRELESS_EXT
 	select CRYPTO
 	select CRYPTO_ARC4
diff --git a/drivers/net/wireless/ipw2x00/Kconfig b/drivers/net/wireless/ipw2x00/Kconfig
index 85cc799..2e65af9 100644
--- a/drivers/net/wireless/ipw2x00/Kconfig
+++ b/drivers/net/wireless/ipw2x00/Kconfig
@@ -4,7 +4,7 @@
 
 config IPW2100
 	tristate "Intel PRO/Wireless 2100 Network Connection"
-	depends on PCI && WLAN_80211
+	depends on PCI
 	select WIRELESS_EXT
 	select FW_LOADER
 	select LIB80211
@@ -63,7 +63,7 @@ config IPW2100_DEBUG
 
 config IPW2200
 	tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
-	depends on PCI && WLAN_80211
+	depends on PCI
 	select WIRELESS_EXT
 	select FW_LOADER
 	select LIB80211
@@ -150,7 +150,7 @@ config IPW2200_DEBUG
 
 config LIBIPW
 	tristate
-	depends on PCI && WLAN_80211
+	depends on PCI
 	select WIRELESS_EXT
 	select CRYPTO
 	select CRYPTO_ARC4
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 99310c0..1fff4bd 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,6 +1,6 @@
 config IWLWIFI
 	tristate "Intel Wireless Wifi"
-	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+	depends on PCI && MAC80211 && EXPERIMENTAL
 	select LIB80211
 	select FW_LOADER
 	select MAC80211_LEDS if IWLWIFI_LEDS
diff --git a/drivers/net/wireless/iwmc3200wifi/Kconfig b/drivers/net/wireless/iwmc3200wifi/Kconfig
index c62da43..c2ea4cb 100644
--- a/drivers/net/wireless/iwmc3200wifi/Kconfig
+++ b/drivers/net/wireless/iwmc3200wifi/Kconfig
@@ -1,6 +1,6 @@
 config IWM
 	tristate "Intel Wireless Multicomm 3200 WiFi driver"
-	depends on MMC && WLAN_80211 && EXPERIMENTAL
+	depends on MMC && EXPERIMENTAL
 	depends on CFG80211
 	select FW_LOADER
 	help
diff --git a/drivers/net/wireless/orinoco/Kconfig b/drivers/net/wireless/orinoco/Kconfig
index 83b635f..13378e0 100644
--- a/drivers/net/wireless/orinoco/Kconfig
+++ b/drivers/net/wireless/orinoco/Kconfig
@@ -1,6 +1,6 @@
 config HERMES
 	tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"
-	depends on (PPC_PMAC || PCI || PCMCIA) && WLAN_80211
+	depends on (PPC_PMAC || PCI || PCMCIA)
 	depends on CFG80211
 	select WIRELESS_EXT
 	select FW_LOADER
diff --git a/drivers/net/wireless/p54/Kconfig b/drivers/net/wireless/p54/Kconfig
index b45d6a4..b0342a5 100644
--- a/drivers/net/wireless/p54/Kconfig
+++ b/drivers/net/wireless/p54/Kconfig
@@ -1,6 +1,6 @@
 config P54_COMMON
 	tristate "Softmac Prism54 support"
-	depends on MAC80211 && WLAN_80211 && EXPERIMENTAL
+	depends on MAC80211 && EXPERIMENTAL
 	select FW_LOADER
 	---help---
 	  This is common code for isl38xx/stlc45xx based modules.
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index ed1f997..0944854 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -1,6 +1,6 @@
 menuconfig RT2X00
 	tristate "Ralink driver support"
-	depends on MAC80211 && WLAN_80211
+	depends on MAC80211
 	---help---
 	  This will enable the support for the Ralink drivers,
 	  developed in the rt2x00 project <http://rt2x00.serialmonkey.com>.
diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 7b14d5b..1818e45 100644
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -1,6 +1,6 @@
 menuconfig WL12XX
 	boolean "TI wl12xx driver support"
-	depends on MAC80211 && WLAN_80211 && EXPERIMENTAL
+	depends on MAC80211 && EXPERIMENTAL
 	---help---
 	  This will enable TI wl12xx driver support. The drivers make
 	  use of the mac80211 stack.
diff --git a/drivers/net/wireless/zd1211rw/Kconfig b/drivers/net/wireless/zd1211rw/Kconfig
index 74b31ea..5f80969 100644
--- a/drivers/net/wireless/zd1211rw/Kconfig
+++ b/drivers/net/wireless/zd1211rw/Kconfig
@@ -1,6 +1,6 @@
 config ZD1211RW
 	tristate "ZyDAS ZD1211/ZD1211B USB-wireless support"
-	depends on USB && MAC80211 && WLAN_80211 && EXPERIMENTAL
+	depends on USB && MAC80211 && EXPERIMENTAL
 	select FW_LOADER
 	---help---
 	  This is an experimental driver for the ZyDAS ZD1211/ZD1211B wireless
-- 
1.6.2.5

[PATCH v4 22/34] wireless: remove "Wireless" from rndis kconfig entry

[Luis R. Rodriguez]

Cc: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
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 9fc1f4f..a39fa8f 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -558,7 +558,7 @@ config PCMCIA_WL3501
 	 micro support for ethtool.
 
 config USB_NET_RNDIS_WLAN
-	tristate "Wireless RNDIS USB support"
+	tristate "RNDIS USB support"
 	depends on USB && EXPERIMENTAL
 	depends on CFG80211
 	select USB_USBNET
-- 
1.6.2.5

[PATCH v4 23/34] wireless: downgrade TI driver from menuconfig to config

[Luis R. Rodriguez]

There's only a few options here so let this expand upon
selection.

Cc: Kalle Valo <kalle.valo@nokia.com>
Acked-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 drivers/net/wireless/wl12xx/Kconfig |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 1818e45..78029fd 100644
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -1,10 +1,12 @@
-menuconfig WL12XX
+config WL12XX
 	boolean "TI wl12xx driver support"
 	depends on MAC80211 && EXPERIMENTAL
 	---help---
 	  This will enable TI wl12xx driver support. The drivers make
 	  use of the mac80211 stack.
 
+if WL12XX
+
 config WL1251
 	tristate "TI wl1251 support"
 	depends on WL12XX && GENERIC_HARDIRQS
@@ -50,3 +52,5 @@ config WL1271
 
 	  If you choose to build a module, it'll be called wl1271. Say N if
 	  unsure.
+
+endif # WL12XX
-- 
1.6.2.5

[PATCH v4 24/34] wireless: Update TI kconfig description

[Luis R. Rodriguez]

Other TI drivers can land here now.

Cc: Kalle Valo <kalle.valo@nokia.com>
Cc: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 drivers/net/wireless/wl12xx/Kconfig |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 78029fd..46afa88 100644
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -1,9 +1,8 @@
 config WL12XX
-	boolean "TI wl12xx driver support"
+	boolean "Texas Instruments"
 	depends on MAC80211 && EXPERIMENTAL
 	---help---
-	  This will enable TI wl12xx driver support. The drivers make
-	  use of the mac80211 stack.
+	  This will enable support for Texas Instruments wireless chipsets.
 
 if WL12XX
 
-- 
1.6.2.5

[PATCH v4 25/34] wireless: make ath consistent with the other groups

[Luis R. Rodriguez]

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 drivers/net/wireless/ath/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig
index 9bfa909..b974b73 100644
--- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@ -1,5 +1,5 @@
 menuconfig ATH_COMMON
-	tristate "Atheros Wireless Cards"
+	tristate "Atheros"
 	depends on CFG80211
 	---help---
 	  This will enable the support for the Atheros wireless drivers.
-- 
1.6.2.5

[PATCH v4 26/34] wireless: update top level wireless driver entry

[Luis R. Rodriguez]

Change it to a menuconfig to give it some documentation, to
refer users to our wireless wiki for extra resources and
documentation. It seems our wiki is still obscure to some.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 drivers/net/wireless/Kconfig |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index a39fa8f..2b0fdf4 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -2,8 +2,17 @@
 # Wireless LAN device configuration
 #
 
-menu "Wireless LAN"
+menuconfig WLAN
+	bool "IEEE 802.11 - Wireless LAN"
 	depends on !S390
+	---help---
+	  This section contains all the pre 802.11 and 802.11 wireless
+	  device drivers. For a complete list of drivers and documentation
+	  on them refer to the wireless wiki:
+
+	  http://wireless.kernel.org/en/users/Drivers
+
+if WLAN
 
 menuconfig WLAN_PRE80211
 	bool "Wireless LAN (pre-802.11)"
@@ -604,4 +613,4 @@ config MAC80211_HWSIM
 	  To compile this driver as a module, choose M here: the module will be
 	  called mac80211_hwsim.  If unsure, say N.
 
-endmenu
+endif # WLAN
-- 
1.6.2.5

[PATCH v4 27/34] wireless: update wireless kconfig description

[Luis R. Rodriguez]

"Wireless" is a misnomer 802.11 as there are plently
of other wireless technologies. Be more specific and refer
people to our good hearty wireless wiki for documentation.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/Kconfig |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/net/Kconfig b/net/Kconfig
index 041c35e..31c208d 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -260,9 +260,15 @@ config FIB_RULES
 	bool
 
 menuconfig WIRELESS
-	bool "Wireless"
+	bool "IEEE 802.11 - Wireless LAN"
 	depends on !S390
 	default y
+	---help---
+	  This allows you to enable different parts of the networking subsystem
+	  to support IEEE 802.11 Wireless LAN networks. For news and
+	  documentation refer to the wireless wiki:
+
+	  http://wireless.kernel.org
 
 if WIRELESS
 
-- 
1.6.2.5

[PATCH v4 28/34] wireless: update cfg80211 kconfig entry

[Luis R. Rodriguez]

cfg80211 is now *the* wireless configuration API. Lets also
give a little explanation as to what it is and refer people to
the wireless wiki for more information.

Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/wireless/Kconfig |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index c6031d5..e060b87 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -1,5 +1,19 @@
 config CFG80211
-	tristate "Improved wireless configuration API"
+	tristate "cfg80211 - wireless configuration API"
+	---help---
+	  cfg80211 is the Linux wireless LAN (802.11) configuration API.
+	  Enable this if you have a wireless device or if you just want
+	  to test the wireless subsystem (see mac80211_hwsim). cfg80211
+	  allows for device drivers to register themselves with the
+	  networking subsystem and allows for userspace configuration
+	  through a generic netlink family for wireless called nl80211.
+
+	  For more information refer to documentation on the wireless wiki:
+
+	  http://wireless.kernel.org/en/developers/Documentation/cfg80211
+
+	  When built as a module cfg80211 will be built as cfg80211.ko
+
 	depends on RFKILL || !RFKILL
 
 config NL80211_TESTMODE
-- 
1.6.2.5

[PATCH v4 29/34] wireless: update reg debug kconfig entry

[Luis R. Rodriguez]

Refer to the wireless wiki for more information.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/wireless/Kconfig |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index e060b87..60dd09e 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -37,6 +37,10 @@ config CFG80211_REG_DEBUG
 	default n
 	---help---
 	  You can enable this if you want to debug regulatory changes.
+	  For more information on cfg80211 regulatory refer to the wireless
+	  wiki:
+
+	  http://wireless.kernel.org/en/developers/Regulatory
 
 	  If unsure, say N.
 
-- 
1.6.2.5

[PATCH v4 30/34] wireless: update WIRELESS_EXT kconfig entry

[Luis R. Rodriguez]

Provide more documentation as to why its being deprecated.

Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/wireless/Kconfig |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 60dd09e..b07ed2c 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -86,8 +86,16 @@ config WIRELESS_EXT
 	bool "Wireless extensions"
 	default y
 	---help---
-	  This option enables the legacy wireless extensions
-	  (wireless network interface configuration via ioctls.)
+	  This option enables the legacy wireless extensions.
+	  Wireless extensions was the first 802.11 wireless configuration
+	  API used by the networking subsystem. You will not need this unless
+	  you have old userspace utilities or old wireless devices which
+	  have not yet been ported to cfg80211.
+
+	  Wireless extensions is being deprecated in favor for cfg80211. For
+	  information regarding why see the wireless wiki:
+
+	  http://wireless.kernel.org/en/developers/Documentation/Wireless-Extensions
 
 	  Say Y unless you've upgraded all your userspace to use
 	  nl80211 instead of wireless extensions.
-- 
1.6.2.5

[PATCH v4 31/34] wireless: update mac80211 kconfig entry

[Luis R. Rodriguez]

This updates the mac80211 kconfig entry to clarify
what it is and refer people to our wireless wiki for
more documentation.

Cc: Jouni Malinen <j@w1.fi>
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/mac80211/Kconfig |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 9db4ff8..d4d3dca 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -1,5 +1,5 @@
 config MAC80211
-	tristate "Generic IEEE 802.11 Networking Stack (mac80211)"
+	tristate "mac80211 - SoftMAC device support"
 	depends on CFG80211
 	select CRYPTO
 	select CRYPTO_ECB
@@ -7,8 +7,27 @@ config MAC80211
 	select CRYPTO_AES
 	select CRC32
 	---help---
-	  This option enables the hardware independent IEEE 802.11
-	  networking stack.
+	  This option enables support for a framework used by IEEE-802.11
+	  SoftMAC devices. SoftMAC devices allow for a finer control of the
+	  hardware, allowing for 802.11 frame management to be done in software
+	  for them, for both parsing and generation of 802.11 wireless frames.
+	  Most 802.11 devices today tend to be of this type.
+
+	  mac8011 implements the cfg80211 callbacks for SoftMAC devices,
+	  mac80211 then depends on cfg80211 for both registration to the networking
+	  subsystem and for configuration. Configuration is handled by cfg80211 both
+	  through nl80211 and wireless extensions.
+
+	  If you have new userspace utitlities which support nl80211 you do not
+	  need wireless-extensions to support a mac80211 device.
+
+	  For more information refer the the wireless wiki entry on mac80211:
+
+	  http://wireless.kernel.org/en/developers/Documentation/mac80211
+
+	  When built as a module mac80211 will be built as mac80211.ko, if not sure
+	  you should build this as a module.
+
 
 comment "CFG80211 needs to be enabled for MAC80211"
 	depends on CFG80211=n
-- 
1.6.2.5

[PATCH v4 32/34] wireless: make mac80211 select cfg80211

[Luis R. Rodriguez]

We can now remove that comment about mac80211 requiring
cfg80211 and do that for the user.

Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/mac80211/Kconfig |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index d4d3dca..6293b21 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -1,6 +1,6 @@
 config MAC80211
 	tristate "mac80211 - SoftMAC device support"
-	depends on CFG80211
+	select CFG80211
 	select CRYPTO
 	select CRYPTO_ECB
 	select CRYPTO_ARC4
@@ -28,10 +28,6 @@ config MAC80211
 	  When built as a module mac80211 will be built as mac80211.ko, if not sure
 	  you should build this as a module.
 
-
-comment "CFG80211 needs to be enabled for MAC80211"
-	depends on CFG80211=n
-
 menu "Rate control algorithm selection"
 	depends on MAC80211 != n
 
-- 
1.6.2.5

[PATCH v4 33/34] wireless: remove mac80211 rate selection extra menu

[Luis R. Rodriguez]

We can just display this upon enabling mac80211 with an
'if MAC80211 != n' check.

Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/mac80211/Kconfig |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 6293b21..8e4c8cf 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -28,8 +28,7 @@ config MAC80211
 	  When built as a module mac80211 will be built as mac80211.ko, if not sure
 	  you should build this as a module.
 
-menu "Rate control algorithm selection"
-	depends on MAC80211 != n
+if MAC80211 != n
 
 config MAC80211_RC_PID
 	bool "PID controller based rate control algorithm" if EMBEDDED
@@ -76,7 +75,7 @@ config MAC80211_RC_DEFAULT
 	default "pid" if MAC80211_RC_DEFAULT_PID
 	default ""
 
-endmenu
+endif
 
 config MAC80211_MESH
 	bool "Enable mac80211 mesh networking (pre-802.11s) support"
-- 
1.6.2.5

[PATCH v4 34/34] wireless: mark prism54.ko as deprecated and mark for removal

[Luis R. Rodriguez]

The preferred modules is p54.ko, which also supports FullMAC
PCI / Cardbus devices. We schedule removal for 2.6.34. Reason
to remove this is no one really is testing prism54.ko anymore,
and while it works p54.ko provides support for the same hardware.
It should be noted I have been told some FullMAC devices may not
have worked with the SoftMAC driver but to date we have yet to
recieve a single bug report regarding this. If there are users
out there please let us know!

Cc: aquilaver@yahoo.com
Cc: linux-kernel@vger.kernel.org
Cc: Dan Williams <dcbw@redhat.com>
Cc: Kai Engert <kengert@redhat.com>
Cc: Jean Tourrilhes <jt@hpl.hp.com>
Cc: Tim de Waal<tim.dewaal@yahoo.com>
Cc: Roy Marples <uberlord@gentoo.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Christian Lamparter <chunkeey@web.de>
Cc: Björn Steinbrink <B.Steinbrink@gmx.de>
Cc: Tim Gardner <tim.gardner@canonical.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 Documentation/feature-removal-schedule.txt |   29 +++++++++++++++
 drivers/net/wireless/Kconfig               |   53 +++++++--------------------
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 09e031c..e887764 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -6,6 +6,35 @@ be removed from this file.
 
 ---------------------------
 
+What:	PRISM54
+When:	2.6.34
+
+Why:	prism54 FullMAC PCI / Cardbus devices used to be supported only by the
+	prism54.ko wireless driver. After Intersil stopped selling these
+	devices in preference for the newer more flexible SoftMAC devices
+	a SoftMAC device driver was required and prism54.ko did not support
+	them. The p54 driver now exists and has been present in the kernel for
+	a while. This driver supports both SoftMAC devices and FullMAC devices.
+	The main difference between these devices was the amount of memory which
+	could be used for the firmware. The SoftMAC devices support a smaller
+	amount of memory. Because of this the SoftMAC firmware fits into FullMAC
+	devices's memory. p54 supports not only PCI / Cardbus but also USB
+	and SPI. Since p54.ko supports all devices prism54.ko supports
+	you will have a conflict. I'm not quite sure how distributions are
+	handling this conflict right now. prism54.ko was kept around due to
+	claims users may experience issues when using the SoftMAC driver.
+	Time has passed users have not reported issues. If you use prism54.ko
+	and for whatever reason you cannot use p54.ko please let us know!
+	E-mail us at: linux-wireless@vger.kernel.org
+
+	For more information see the p54 wiki page:
+
+	http://wireless.kernel.org/en/users/Drivers/p54
+
+Who:	Luis R. Rodriguez <lrodriguez@atheros.com>
+
+---------------------------
+
 What:	IRQF_SAMPLE_RANDOM
 Check:	IRQF_SAMPLE_RANDOM
 When:	July 2009
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 2b0fdf4..974c4ae 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -267,51 +267,26 @@ if CONEXANT_ST_80211
 source "drivers/net/wireless/p54/Kconfig"
 
 config PRISM54
-	tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus' 
+	tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)'
 	depends on PCI && EXPERIMENTAL
 	select WIRELESS_EXT
 	select FW_LOADER
 	---help---
-	  Enable PCI and Cardbus support for the following chipset based cards:
+	  This enables support for FullMAC PCI/Cardbus prism54 devices. This
+	  driver is now deprecated in favor for the SoftMAC driver, p54. p54
+	  supports FullMAC PCI/Cardbus devices as well. For details on the
+	  removal of this driver on the kernel see the feature removal
+	  schedule:
 
-	  ISL3880 - Prism GT            802.11 b/g
-	  ISL3877 - Prism Indigo        802.11 a
-	  ISL3890 - Prism Duette        802.11 a/b/g
-	  
-	  For a complete list of supported cards visit <http://prism54.org>.
-	  Here is the latest confirmed list of supported cards:
-
-	  3com OfficeConnect 11g Cardbus Card aka 3CRWE154G72 (version 1)
-	  Allnet ALL0271 PCI Card
-	  Compex WL54G Cardbus Card
-	  Corega CG-WLCB54GT Cardbus Card
-	  D-Link Air Plus Xtreme G A1 Cardbus Card aka DWL-g650
-	  I-O Data WN-G54/CB Cardbus Card
-	  Kobishi XG-300 aka Z-Com Cardbus Card
-	  Netgear WG511 Cardbus Card
-	  Ovislink WL-5400PCI PCI Card
-	  Peabird WLG-PCI PCI Card
-	  Sitecom WL-100i Cardbus Card
-	  Sitecom WL-110i PCI Card
-	  SMC2802W -    EZ Connect g 2.4GHz 54 Mbps Wireless PCI Card
-	  SMC2835W -    EZ Connect g 2.4GHz 54 Mbps Wireless Cardbus Card
-	  SMC2835W-V2 - EZ Connect g 2.4GHz 54 Mbps Wireless Cardbus Card
-	  Z-Com XG-900 PCI Card
-	  Zyxel G-100 Cardbus Card
-
-	  If you enable this you will need a firmware file as well.
-	  You will need to copy this to /usr/lib/hotplug/firmware/isl3890.
-	  You can get this non-GPL'd firmware file from the Prism54 project page:
-	  <http://prism54.org>
-	  You will also need the /etc/hotplug/firmware.agent script from
-	  a current hotplug package.
-
-	  Note: You need a motherboard with DMA support to use any of these cards 
+	  Documentation/feature-removal-schedule.txt
+
+	  For more information refer to the prism54 wiki:
+
+	  http://wireless.kernel.org/en/users/Drivers/p54
+
+	  Note: You need a motherboard with DMA support to use any of these cards
 	  
-	  If you want to compile the driver as a module ( = code which can be
-	  inserted in and removed from the running kernel whenever you want),
-	  say M here and read <file:Documentation/kbuild/modules.txt>.
-	  The module will be called prism54.
+	  When built as module you get prism54.ko
 
 endif # CONEXANT_ST_80211
 
-- 
1.6.2.5

Re: [PATCH v4 13/34] wireless: move AIRO_CS closer to AIRO_CS

[Pavel Roskin]

On Fri, 2009-08-14 at 16:25 -0400, Luis R. Rodriguez wrote:
> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

You mean "wireless: move AIRO_CS closer to AIRO"

Otherwise it's sort of pointless :-)

-- 
Regards,
Pavel Roskin

Re: [PATCH v4 13/34] wireless: move AIRO_CS closer to AIRO_CS

[Gábor Stefanik]

On Fri, Aug 14, 2009 at 10:57 PM, Pavel Roskin<proski@gnu.org> wrote:
> On Fri, 2009-08-14 at 16:25 -0400, Luis R. Rodriguez wrote:
>> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
>
> You mean "wireless: move AIRO_CS closer to AIRO"
>
> Otherwise it's sort of pointless :-)
>

Unless AIRO_CS has a split personality. :-)

-- 
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)

Re: [PATCH v4 32/34] wireless: make mac80211 select cfg80211

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

On Fri, 2009-08-14 at 16:25 -0400, Luis R. Rodriguez wrote:
> We can now remove that comment about mac80211 requiring
> cfg80211 and do that for the user.

"now"? What changed to make this possible?

NAK this change, because with it, it's possible to select
mac80211 = Y
-> cfg80211 = Y
while rfkill = M

which will break the kernel build.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH v4 30/34] wireless: update WIRELESS_EXT kconfig entry

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 1165 bytes --]

On Fri, 2009-08-14 at 16:25 -0400, Luis R. Rodriguez wrote:
> Provide more documentation as to why its being deprecated.
> 
> Cc: Johannes Berg <johannes@sipsolutions.net>
> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
> ---
>  net/wireless/Kconfig |   12 ++++++++++--
>  1 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
> index 60dd09e..b07ed2c 100644
> --- a/net/wireless/Kconfig
> +++ b/net/wireless/Kconfig
> @@ -86,8 +86,16 @@ config WIRELESS_EXT
>  	bool "Wireless extensions"
>  	default y
>  	---help---
> -	  This option enables the legacy wireless extensions
> -	  (wireless network interface configuration via ioctls.)
> +	  This option enables the legacy wireless extensions.
> +	  Wireless extensions was the first 802.11 wireless configuration
> +	  API used by the networking subsystem. You will not need this unless
> +	  you have old userspace utilities or old wireless devices which
> +	  have not yet been ported to cfg80211.

I cannot agree with this wording -- all current tools still use wext
unless you go really experimental.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH v4 31/34] wireless: update mac80211 kconfig entry

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]


> -	  This option enables the hardware independent IEEE 802.11
> -	  networking stack.
> +	  This option enables support for a framework used by IEEE-802.11
> +	  SoftMAC devices. SoftMAC devices allow for a finer control of the
> +	  hardware, allowing for 802.11 frame management to be done in software
> +	  for them, for both parsing and generation of 802.11 wireless frames.
> +	  Most 802.11 devices today tend to be of this type.


> +	  mac8011 implements the cfg80211 callbacks for SoftMAC devices,

mac80211

> +	  mac80211 then depends on cfg80211 for both registration to the networking
> +	  subsystem and for configuration. Configuration is handled by cfg80211 both
> +	  through nl80211 and wireless extensions.
> +
> +	  If you have new userspace utitlities which support nl80211 you do not

utilities

> +	  need wireless-extensions to support a mac80211 device.

And in any case I really don't see a need to explain the wireless
configuration stuff in a Kconfig entry.


IMHO the text should be short and to the point, your texts give too much
background information that doesn't help anyone except people who
already know about wireless stuff to make a choice.


> +	  For more information refer the the wireless wiki entry on mac80211:
> +
> +	  http://wireless.kernel.org/en/developers/Documentation/mac80211
> +
> +	  When built as a module mac80211 will be built as mac80211.ko, if not sure
> +	  you should build this as a module.

We do not include the '.ko' in the module name, just say "The module
will be named mac80211" or so.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH v4 28/34] wireless: update cfg80211 kconfig entry

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 1136 bytes --]

On Fri, 2009-08-14 at 16:25 -0400, Luis R. Rodriguez wrote:

>  config CFG80211
> -	tristate "Improved wireless configuration API"
> +	tristate "cfg80211 - wireless configuration API"
> +	---help---
> +	  cfg80211 is the Linux wireless LAN (802.11) configuration API.
> +	  Enable this if you have a wireless device or if you just want
> +	  to test the wireless subsystem (see mac80211_hwsim).

This is not really correct, hwsim depends on mac80211, not cfg80211 --
the latter only implicitly.

>  cfg80211
> +	  allows for device drivers to register themselves with the
> +	  networking subsystem and allows for userspace configuration
> +	  through a generic netlink family for wireless called nl80211.

Again, too much background information. Nobody cares at this point -- it
should answer the question "will this help get my hardware working?"

> +	  For more information refer to documentation on the wireless wiki:
> +
> +	  http://wireless.kernel.org/en/developers/Documentation/cfg80211
> +
> +	  When built as a module cfg80211 will be built as cfg80211.ko

Again -- don't mention .ko.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH v4 00/34] wireless: update/re-arrange kconfigs

[Luis R. Rodriguez]

On Fri, Aug 14, 2009 at 1:25 PM, Luis R.
Rodriguez<lrodriguez@atheros.com> wrote:
> Here is the 4th iteration of this series

John please ignore 28-33 but please do consider 1-32 and 34 unless
there are objections raised.

  Luis

Re: [PATCH v4 34/34] wireless: mark prism54.ko as deprecated and mark for removal

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 858 bytes --]

On Fri, 2009-08-14 at 16:25 -0400, Luis R. Rodriguez wrote:
> The preferred modules is p54.ko, which also supports FullMAC
> PCI / Cardbus devices. We schedule removal for 2.6.34. Reason
> to remove this is no one really is testing prism54.ko anymore,
> and while it works p54.ko provides support for the same hardware.
> It should be noted I have been told some FullMAC devices may not
> have worked with the SoftMAC driver but to date we have yet to
> recieve a single bug report regarding this. If there are users
> out there please let us know!

Not that I care about the changelog, but I do find it illogical to refer
to modules w/o .ko everywhere and then with .ko in the changelog. Of
course you were consistent ;)

> -	  The module will be called prism54.
> +	  When built as module you get prism54.ko

NAK this change.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH v4 10/34] wireless: group Broadcom drivers on kconfig

[Gábor Stefanik]

On Fri, Aug 14, 2009 at 10:25 PM, Luis R.
Rodriguez<lrodriguez@atheros.com> wrote:
> 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.

NAK. Again, rndis_wlan is Microsoft, not Broadcom.

> +
> +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
>
>



-- 
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)

Re: [PATCH v4 32/34] wireless: make mac80211 select cfg80211

[Gábor Stefanik]

On Fri, Aug 14, 2009 at 11:06 PM, Johannes
Berg<johannes@sipsolutions.net> wrote:
> On Fri, 2009-08-14 at 16:25 -0400, Luis R. Rodriguez wrote:
>> We can now remove that comment about mac80211 requiring
>> cfg80211 and do that for the user.
>
> "now"? What changed to make this possible?
>
> NAK this change, because with it, it's possible to select
> mac80211 = Y
> -> cfg80211 = Y
> while rfkill = M
>
> which will break the kernel build.
>
> johannes
>

Why not make cfg80211 select rfkill?

-- 
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)

Re: [PATCH v4 23/34] wireless: downgrade TI driver from menuconfig to config

[Gábor Stefanik]

On Fri, Aug 14, 2009 at 10:25 PM, Luis R.
Rodriguez<lrodriguez@atheros.com> wrote:
> There's only a few options here so let this expand upon
> selection.
>
> Cc: Kalle Valo <kalle.valo@nokia.com>
> Acked-by: Luciano Coelho <luciano.coelho@nokia.com>
> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
> ---
>  drivers/net/wireless/wl12xx/Kconfig |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
> index 1818e45..78029fd 100644
> --- a/drivers/net/wireless/wl12xx/Kconfig
> +++ b/drivers/net/wireless/wl12xx/Kconfig
> @@ -1,10 +1,12 @@
> -menuconfig WL12XX
> +config WL12XX
>        boolean "TI wl12xx driver support"
>        depends on MAC80211 && EXPERIMENTAL
>        ---help---
>          This will enable TI wl12xx driver support. The drivers make
>          use of the mac80211 stack.
>
> +if WL12XX
> +
>  config WL1251
>        tristate "TI wl1251 support"
>        depends on WL12XX && GENERIC_HARDIRQS

If "if WL12XX", then no need to depend on WL12XX.

> @@ -50,3 +52,5 @@ config WL1271
>
>          If you choose to build a module, it'll be called wl1271. Say N if
>          unsure.
> +
> +endif # WL12XX
> --
> 1.6.2.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>



-- 
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)

Re: [PATCH v4 32/34] wireless: make mac80211 select cfg80211

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

[please trim your quotes]

On Sat, 2009-08-15 at 14:12 +0200, Gábor Stefanik wrote:

> > NAK this change, because with it, it's possible to select
> > mac80211 = Y
> > -> cfg80211 = Y
> > while rfkill = M

> Why not make cfg80211 select rfkill?

Because it doesn't require it. See net/wireless/Kconfig.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH v4 10/34] wireless: group Broadcom drivers on kconfig

[Luis R. Rodriguez]

2009/8/15 Gábor Stefanik <netrolller.3d@gmail.com>:
> On Fri, Aug 14, 2009 at 10:25 PM, Luis R.
> Rodriguez<lrodriguez@atheros.com> wrote:
>> 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.
>
> NAK. Again, rndis_wlan is Microsoft, not Broadcom.

Yes, the patch does not group rndis with broadcom, please re-read the patch.

  Luis

Re: [PATCH v4 23/34] wireless: downgrade TI driver from menuconfig to config

[Luis R. Rodriguez]

2009/8/15 Gábor Stefanik <netrolller.3d@gmail.com>:
> On Fri, Aug 14, 2009 at 10:25 PM, Luis R.
> Rodriguez<lrodriguez@atheros.com> wrote:
>> There's only a few options here so let this expand upon
>> selection.
>>
>> Cc: Kalle Valo <kalle.valo@nokia.com>
>> Acked-by: Luciano Coelho <luciano.coelho@nokia.com>
>> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
>> ---
>>  drivers/net/wireless/wl12xx/Kconfig |    6 +++++-
>>  1 files changed, 5 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
>> index 1818e45..78029fd 100644
>> --- a/drivers/net/wireless/wl12xx/Kconfig
>> +++ b/drivers/net/wireless/wl12xx/Kconfig
>> @@ -1,10 +1,12 @@
>> -menuconfig WL12XX
>> +config WL12XX
>>        boolean "TI wl12xx driver support"
>>        depends on MAC80211 && EXPERIMENTAL
>>        ---help---
>>          This will enable TI wl12xx driver support. The drivers make
>>          use of the mac80211 stack.
>>
>> +if WL12XX
>> +
>>  config WL1251
>>        tristate "TI wl1251 support"
>>        depends on WL12XX && GENERIC_HARDIRQS
>
> If "if WL12XX", then no need to depend on WL12XX.

True!

  Luis

Re: [PATCH v4 10/34] wireless: group Broadcom drivers on kconfig

[Gábor Stefanik]

2009/8/16 Luis R. Rodriguez <lrodriguez@atheros.com>:
> 2009/8/15 Gábor Stefanik <netrolller.3d@gmail.com>:
>> On Fri, Aug 14, 2009 at 10:25 PM, Luis R.
>> Rodriguez<lrodriguez@atheros.com> wrote:
>>> 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.
>>
>> NAK. Again, rndis_wlan is Microsoft, not Broadcom.
>
> Yes, the patch does not group rndis with broadcom, please re-read the patch.
>
>  Luis
>

But it does say "This includes b43 driver, b43legacy driver and the
rndis_wlan driver.", which is wrong.

-- 
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)

Re: [PATCH v4 10/34] wireless: group Broadcom drivers on kconfig

[Luis R. Rodriguez]

On Sun, Aug 16, 2009 at 06:15:43AM -0700, Gábor Stefanik wrote:
> 2009/8/16 Luis R. Rodriguez <lrodriguez@atheros.com>:
> > 2009/8/15 Gábor Stefanik <netrolller.3d@gmail.com>:
> >> On Fri, Aug 14, 2009 at 10:25 PM, Luis R.
> >> Rodriguez<lrodriguez@atheros.com> wrote:
> >>> 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.
> >>
> >> NAK. Again, rndis_wlan is Microsoft, not Broadcom.
> >
> > Yes, the patch does not group rndis with broadcom, please re-read the patch.
> >
> >  Luis
> >
> 
> But it does say "This includes b43 driver, b43legacy driver and the
> rndis_wlan driver.", which is wrong.

Ah indeed. Thanks for the review.

  Luis

Re: [PATCH v4 32/34] wireless: make mac80211 select cfg80211

[Luis R. Rodriguez]

On Fri, Aug 14, 2009 at 2:06 PM, Johannes Berg<johannes@sipsolutions.net> wrote:
> On Fri, 2009-08-14 at 16:25 -0400, Luis R. Rodriguez wrote:
>> We can now remove that comment about mac80211 requiring
>> cfg80211 and do that for the user.
>
> "now"? What changed to make this possible?
>
> NAK this change, because with it, it's possible to select
> mac80211 = Y
> -> cfg80211 = Y
> while rfkill = M
>
> which will break the kernel build.

I'm able to do this with current kconfig, does this need to be fixed?

  Luis

Re: [PATCH v4 34/34] wireless: mark prism54.ko as deprecated and mark for removal

[Luis R. Rodriguez]

On Sat, Aug 15, 2009 at 12:59:42AM -0700, Johannes Berg wrote:
> On Fri, 2009-08-14 at 16:25 -0400, Luis R. Rodriguez wrote:
> > The preferred modules is p54.ko, which also supports FullMAC
> > PCI / Cardbus devices. We schedule removal for 2.6.34. Reason
> > to remove this is no one really is testing prism54.ko anymore,
> > and while it works p54.ko provides support for the same hardware.
> > It should be noted I have been told some FullMAC devices may not
> > have worked with the SoftMAC driver but to date we have yet to
> > recieve a single bug report regarding this. If there are users
> > out there please let us know!
> 
> Not that I care about the changelog, but I do find it illogical to refer
> to modules w/o .ko everywhere and then with .ko in the changelog. Of
> course you were consistent ;)

Heh I've gone and cleaned this up in the series, I just removed the
.ko usage when I refer to modules in the entries and commit log.

> > -	  The module will be called prism54.
> > +	  When built as module you get prism54.ko
> 
> NAK this change.

Heh ok, changed it.

  Luis

Re: [PATCH v4 32/34] wireless: make mac80211 select cfg80211

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 890 bytes --]

On Mon, 2009-08-17 at 10:00 -0700, Luis R. Rodriguez wrote:
> On Fri, Aug 14, 2009 at 2:06 PM, Johannes Berg<johannes@sipsolutions.net> wrote:
> > On Fri, 2009-08-14 at 16:25 -0400, Luis R. Rodriguez wrote:
> >> We can now remove that comment about mac80211 requiring
> >> cfg80211 and do that for the user.
> >
> > "now"? What changed to make this possible?
> >
> > NAK this change, because with it, it's possible to select
> > mac80211 = Y
> > -> cfg80211 = Y
> > while rfkill = M
> >
> > which will break the kernel build.
> 
> I'm able to do this with current kconfig, does this need to be fixed?

I don't think you can select this with the current config since cfg80211
depends on RFKILL == CFG80211 || RFKILL == n.

So you can do
CFG80211 = m
RFKILL = m

CFG80211 = *
RFKILL = n

CFG80211 = *
RFKILL = y

but NOT

CFG80211 = y
RFKILL = m

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH v4 32/34] wireless: make mac80211 select cfg80211

[Luis R. Rodriguez]

On Mon, Aug 17, 2009 at 02:37:49PM -0700, Johannes Berg wrote:
> On Mon, 2009-08-17 at 10:00 -0700, Luis R. Rodriguez wrote:
> > On Fri, Aug 14, 2009 at 2:06 PM, Johannes Berg<johannes@sipsolutions.net> wrote:
> > > On Fri, 2009-08-14 at 16:25 -0400, Luis R. Rodriguez wrote:
> > >> We can now remove that comment about mac80211 requiring
> > >> cfg80211 and do that for the user.
> > >
> > > "now"? What changed to make this possible?
> > >
> > > NAK this change, because with it, it's possible to select
> > > mac80211 = Y
> > > -> cfg80211 = Y
> > > while rfkill = M
> > >
> > > which will break the kernel build.
> > 
> > I'm able to do this with current kconfig, does this need to be fixed?
> 
> I don't think you can select this with the current config since cfg80211
> depends on RFKILL == CFG80211 || RFKILL == n.
> 
> So you can do
> CFG80211 = m
> RFKILL = m
> 
> CFG80211 = *
> RFKILL = n
> 
> CFG80211 = *
> RFKILL = y
> 
> but NOT
> 
> CFG80211 = y
> RFKILL = m


Ah I see, thanks. OK how about this then:

From: Luis R. Rodriguez <lrodriguez@atheros.com>
Subject: [PATCH] wireless: make mac80211 select cfg80211

This lets us keep mac80211 on the menu map even if cfg80211
is not enabled. We now remove that pesky comment about this.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 net/mac80211/Kconfig |    5 +----
 net/rfkill/Kconfig   |    1 +
 net/wireless/Kconfig |    1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 8300d19..8fc6ae6 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -1,6 +1,6 @@
 config MAC80211
 	tristate "mac80211 - SoftMAC device support"
-	depends on CFG80211
+	select CFG80211
 	select CRYPTO
 	select CRYPTO_ECB
 	select CRYPTO_ARC4
@@ -23,9 +23,6 @@ config MAC80211
 	  When built as a module mac80211 will be built as mac80211, if not sure
 	  you should build this as a module.
 
-comment "CFG80211 needs to be enabled for MAC80211"
-	depends on CFG80211=n
-
 if MAC80211 != n
 
 config MAC80211_RC_PID
diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig
index eaf7658..65e98b8 100644
--- a/net/rfkill/Kconfig
+++ b/net/rfkill/Kconfig
@@ -3,6 +3,7 @@
 #
 menuconfig RFKILL
 	tristate "RF switch subsystem support"
+	depends on CFG80211 || !CFG80211
 	help
 	  Say Y here if you want to have control over RF switches
 	  found on many WiFi and Bluetooth cards.
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 982004b..524aeaf 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -1,6 +1,5 @@
 config CFG80211
 	tristate "cfg80211 - wireless configuration API"
-	depends on RFKILL || !RFKILL
 	---help---
 	  cfg80211 is the Linux wireless LAN (802.11) configuration API.
 	  Enable this if you have a wireless device.
-- 
1.6.3.3

Re: [PATCH v4 32/34] wireless: make mac80211 select cfg80211

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

On Mon, 2009-08-17 at 17:35 -0700, Luis R. Rodriguez wrote:

> From: Luis R. Rodriguez <lrodriguez@atheros.com>
> Subject: [PATCH] wireless: make mac80211 select cfg80211
> 
> This lets us keep mac80211 on the menu map even if cfg80211
> is not enabled. We now remove that pesky comment about this.

>  menuconfig RFKILL
>  	tristate "RF switch subsystem support"
> +	depends on CFG80211 || !CFG80211

That's backwards.

Now you can still have CFG80211=y and RFKILL=m. And RFKILL really
shouldn't depend on one of its users anyway.

Just leave it the way it is please.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]