* Re: [PATCH v4 13/34] wireless: move AIRO_CS closer to AIRO_CS
From: Gábor Stefanik @ 2009-08-14 21:02 UTC (permalink / raw)
To: Pavel Roskin; +Cc: Luis R. Rodriguez, linville, linux-wireless, Larry.Finger
In-Reply-To: <1250283432.8137.19.camel@mj>
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. :-)
^ permalink raw reply
* [PATCH] b43: LP-PHY: Fix another TX power control abuse
From: Gábor Stefanik @ 2009-08-14 21:00 UTC (permalink / raw)
To: John Linville, Michael Buesch, Larry Finger, Mark Huijgen
Cc: Broadcom Wireless, linux-wireless
This should fix the remaining WARN_ON.
Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
---
drivers/net/wireless/b43/phy_lp.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
index bf89173..3872a31 100644
--- a/drivers/net/wireless/b43/phy_lp.c
+++ b/drivers/net/wireless/b43/phy_lp.c
@@ -1059,7 +1059,8 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev *dev)
bool old_txg_ovr;
u8 old_bbmult;
u16 old_rf_ovr, old_rf_ovrval, old_afe_ovr, old_afe_ovrval,
- old_rf2_ovr, old_rf2_ovrval, old_phy_ctl, old_txpctl;
+ old_rf2_ovr, old_rf2_ovrval, old_phy_ctl;
+ enum b43_lpphy_txpctl_mode old_txpctl;
u32 normal_pwr, ideal_pwr, mean_sq_pwr, tmp = 0, mean_sq_pwr_min = 0;
int loopback, i, j, inner_sum;
@@ -1077,8 +1078,8 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev *dev)
old_rf2_ovr = b43_phy_read(dev, B43_LPPHY_RF_OVERRIDE_2);
old_rf2_ovrval = b43_phy_read(dev, B43_LPPHY_RF_OVERRIDE_2_VAL);
old_phy_ctl = b43_phy_read(dev, B43_LPPHY_LP_PHY_CTL);
- old_txpctl = b43_phy_read(dev, B43_LPPHY_TX_PWR_CTL_CMD) &
- B43_LPPHY_TX_PWR_CTL_CMD_MODE;
+ lpphy_read_tx_pctl_mode_from_hardware(dev);
+ old_txpctl = lpphy->txpctl_mode;
lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF);
lpphy_disable_crs(dev);
--
1.6.2.4
^ permalink raw reply related
* Re: [PATCH] b43: Fix sparse warnings
From: Michael Buesch @ 2009-08-14 21:00 UTC (permalink / raw)
To: Pavel Roskin; +Cc: Larry Finger, John W Linville, bcm43xx-dev, linux-wireless
In-Reply-To: <1250283133.8137.16.camel@mj>
On Friday 14 August 2009 22:52:13 Pavel Roskin wrote:
> On Fri, 2009-08-14 at 22:15 +0200, Michael Buesch wrote:
>
> > > - b43_phy_mask(dev, 0x048A, (u16)~0x8000);
> > > + b43_phy_mask(dev, 0x048A, (u16)(~0x8000 & 0xFFFF));
> >
> I would just use 0x7fff here.
That does not work if 0x8000 is a #defined bit.
--
Greetings, Michael.
^ permalink raw reply
* Re: [PATCH v4 13/34] wireless: move AIRO_CS closer to AIRO_CS
From: Pavel Roskin @ 2009-08-14 20:57 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: linville, linux-wireless, Larry.Finger
In-Reply-To: <1250281559-13041-14-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply
* Re: [PATCH] ssb: Fix e typo in the rev8 SPROM extraction routine
From: Michael Buesch @ 2009-08-14 20:53 UTC (permalink / raw)
To: Gábor Stefanik
Cc: John Linville, Larry Finger, Mark Huijgen, Broadcom Wireless,
linux-wireless
In-Reply-To: <4A855489.6010102@gmail.com>
On Friday 14 August 2009 14:11:53 Gábor Stefanik wrote:
> No comment. :-)
>
> Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
> ---
> Mark, this should fix your MAC address bug.
> Anyone else testing LP-PHY should also apply this.
>
> drivers/ssb/pci.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
> index 50811e4..335a43f 100644
> --- a/drivers/ssb/pci.c
> +++ b/drivers/ssb/pci.c
> @@ -480,7 +480,7 @@ static void sprom_extract_r8(struct ssb_sprom *out, const u16 *in)
>
> /* extract the MAC address */
> for (i = 0; i < 3; i++) {
> - v = in[SPOFF(SSB_SPROM1_IL0MAC) + i];
> + v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
> *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
> }
> SPEX(country_code, SSB_SPROM8_CCODE, 0xFFFF, 0);
ack
--
Greetings, Michael.
^ permalink raw reply
* Re: [PATCH] b43: Fix sparse warnings
From: Pavel Roskin @ 2009-08-14 20:52 UTC (permalink / raw)
To: Michael Buesch; +Cc: Larry Finger, John W Linville, bcm43xx-dev, linux-wireless
In-Reply-To: <200908142215.38112.mb@bu3sch.de>
On Fri, 2009-08-14 at 22:15 +0200, Michael Buesch wrote:
> > - b43_phy_mask(dev, 0x048A, (u16)~0x8000);
> > + b43_phy_mask(dev, 0x048A, (u16)(~0x8000 & 0xFFFF));
>
> Uh come on...
> The u16 cast already is stupid as hell, but this is becoming braindead.
> The code is perfectly fine. Sparse should instead provide an option to disable
> this fragile check.
There are cases where we want to know that a constant was truncated. In
fact, in most cases it's a useful warning.
In this case, we intuitively expect that it's OK to cast a result of a
bitwise operation to its original type, as if it was never promoted.
But sparse will need to have a special exception for this case.
I would just use 0x7fff here.
--
Regards,
Pavel Roskin
^ permalink raw reply
* Re: [PATCH] b43: LP-PHY: Fix setting TX power control mode during RC calibration
From: Gábor Stefanik @ 2009-08-14 20:50 UTC (permalink / raw)
To: Larry Finger
Cc: John Linville, Michael Buesch, Mark Huijgen, linux-wireless,
Broadcom Wireless
In-Reply-To: <4A85CC6C.1030005@lwfinger.net>
2009/8/14 Larry Finger <Larry.Finger@lwfinger.net>:
> Gábor Stefanik wrote:
>> Call set_tx_power_control with a LPPHY_TXPCTL rather than an
>> LPPHY_TX_PWR_CTL_CMD_MODE.
>>
>> Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
>> ---
>> This should fix the WARN_ON testers were seeing during init.
>>
>> drivers/net/wireless/b43/phy_lp.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
>> index adfa7bf..558224b 100644
>> --- a/drivers/net/wireless/b43/phy_lp.c
>> +++ b/drivers/net/wireless/b43/phy_lp.c
>> @@ -1080,7 +1080,7 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev *dev)
>> old_txpctl = b43_phy_read(dev, B43_LPPHY_TX_PWR_CTL_CMD) &
>> B43_LPPHY_TX_PWR_CTL_CMD_MODE;
>>
>> - lpphy_set_tx_power_control(dev, B43_LPPHY_TX_PWR_CTL_CMD_MODE_OFF);
>> + lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF);
>> lpphy_disable_crs(dev);
>> loopback = lpphy_loopback(dev);
>> if (loopback == -1)
>
>
> With this one, I still get WARNING: at
> drivers/net/wireless/b43/phy_lp.c:1006
> lpphy_set_tx_power_control+0xbf/0xdd [b43]().
>
> To get rid of them, I need to modify the enum b43_lpphy_txpctl_mode{}
> as I wrote earlier.
Is ctl still 0? Please check.
>
> I'm also seeing the interface stopped and restarted. I'll try to track
> that down.
>
> Larry
>
>
>
--
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)
^ permalink raw reply
* Re: [PATCH] b43: LP-PHY: Fix setting TX power control mode during RC calibration
From: Larry Finger @ 2009-08-14 20:43 UTC (permalink / raw)
To: Gábor Stefanik
Cc: John Linville, Michael Buesch, Mark Huijgen, linux-wireless,
Broadcom Wireless
In-Reply-To: <4A85B8DE.3000704@gmail.com>
Gábor Stefanik wrote:
> Call set_tx_power_control with a LPPHY_TXPCTL rather than an
> LPPHY_TX_PWR_CTL_CMD_MODE.
>
> Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
> ---
> This should fix the WARN_ON testers were seeing during init.
>
> drivers/net/wireless/b43/phy_lp.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
> index adfa7bf..558224b 100644
> --- a/drivers/net/wireless/b43/phy_lp.c
> +++ b/drivers/net/wireless/b43/phy_lp.c
> @@ -1080,7 +1080,7 @@ static void lpphy_rev0_1_rc_calib(struct b43_wldev *dev)
> old_txpctl = b43_phy_read(dev, B43_LPPHY_TX_PWR_CTL_CMD) &
> B43_LPPHY_TX_PWR_CTL_CMD_MODE;
>
> - lpphy_set_tx_power_control(dev, B43_LPPHY_TX_PWR_CTL_CMD_MODE_OFF);
> + lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF);
> lpphy_disable_crs(dev);
> loopback = lpphy_loopback(dev);
> if (loopback == -1)
With this one, I still get WARNING: at
drivers/net/wireless/b43/phy_lp.c:1006
lpphy_set_tx_power_control+0xbf/0xdd [b43]().
To get rid of them, I need to modify the enum b43_lpphy_txpctl_mode{}
as I wrote earlier.
I'm also seeing the interface stopped and restarted. I'll try to track
that down.
Larry
^ permalink raw reply
* Re: [PATCH] b43: Add LP-PHY firmware loading support
From: Michael Buesch @ 2009-08-14 20:41 UTC (permalink / raw)
To: Gábor Stefanik
Cc: John Linville, Larry Finger, Mark Huijgen, Broadcom Wireless,
linux-wireless
In-Reply-To: <69e28c910908141320x12e6988emc2bbdbb5fe1cecbe@mail.gmail.com>
On Friday 14 August 2009 22:20:55 Gábor Stefanik wrote:
> 2009/8/14 Michael Buesch <mb@bu3sch.de>:
> > On Friday 14 August 2009 13:51:59 Gábor Stefanik wrote:
> >> Add support for loading LP-PHY firmware to b43_try_request_fw.
> >>
> >> Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
> >
> > ack
> > --
> > Greetings, Michael.
> >
>
> This version is broken - ack "v3 this time really" instead.
>
yeah whatever
--
Greetings, Michael.
^ permalink raw reply
* [PATCH v4 34/34] wireless: mark prism54.ko as deprecated and mark for removal
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville
Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, aquilaver,
linux-kernel, Dan Williams, Kai Engert, Jean Tourrilhes,
Tim de Waal, Roy Marples, Alan Cox, Christian Lamparter,
Björn Steinbrink, Tim Gardner, Johannes Berg
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 33/34] wireless: remove mac80211 rate selection extra menu
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Johannes Berg
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 32/34] wireless: make mac80211 select cfg80211
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Johannes Berg
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 31/34] wireless: update mac80211 kconfig entry
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville
Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Jouni Malinen,
Johannes Berg
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 30/34] wireless: update WIRELESS_EXT kconfig entry
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Johannes Berg
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 29/34] wireless: update reg debug kconfig entry
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 28/34] wireless: update cfg80211 kconfig entry
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Johannes Berg
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 27/34] wireless: update wireless kconfig description
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
"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
^ permalink raw reply related
* [PATCH v4 26/34] wireless: update top level wireless driver entry
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 25/34] wireless: make ath consistent with the other groups
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/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
^ permalink raw reply related
* [PATCH v4 24/34] wireless: Update TI kconfig description
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville
Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Kalle Valo,
Luciano Coelho
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 23/34] wireless: downgrade TI driver from menuconfig to config
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Kalle Valo
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 22/34] wireless: remove "Wireless" from rndis kconfig entry
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez, Jussi Kivilinna
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 21/34] wireless: simplify WLAN_80211 entries
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 20/34] wireless: simplify WLAN_PRE80211 entries
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
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
^ permalink raw reply related
* [PATCH v4 19/34] wireless: organize individual drivers alphabetically
From: Luis R. Rodriguez @ 2009-08-14 20:25 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Larry.Finger, Luis R. Rodriguez
In-Reply-To: <1250281559-13041-1-git-send-email-lrodriguez@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/net/wireless/Kconfig | 95 +++++++++++++++++++++---------------------
1 files changed, 47 insertions(+), 48 deletions(-)
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 51aa041..583eddc 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -14,30 +14,6 @@ menuconfig WLAN_PRE80211
This option does not affect the kernel build, it only
lets you choose drivers.
-config STRIP
- tristate "STRIP (Metricom starmode radio IP)"
- depends on INET && WLAN_PRE80211
- select WIRELESS_EXT
- ---help---
- Say Y if you have a Metricom radio and intend to use Starmode Radio
- IP. STRIP is a radio protocol developed for the MosquitoNet project
- (on the WWW at <http://mosquitonet.stanford.edu/>) to send Internet
- traffic using Metricom radios. Metricom radios are small, battery
- powered, 100kbit/sec packet radio transceivers, about the size and
- weight of a cellular telephone. (You may also have heard them called
- "Metricom modems" but we avoid the term "modem" because it misleads
- many people into thinking that you can plug a Metricom modem into a
- phone line and use it as a modem.)
-
- You can use STRIP on any Linux machine with a serial port, although
- it is obviously most useful for people with laptop computers. If you
- think you might get a Metricom radio in the future, there is no harm
- in saying Y to STRIP now, except that it makes the kernel a bit
- bigger.
-
- To compile this as a module, choose M here: the module will be
- called strip.
-
config ARLAN
tristate "Aironet Arlan 655 & IC2200 DS support"
depends on ISA && !64BIT && WLAN_PRE80211
@@ -89,6 +65,30 @@ config PCMCIA_WAVELAN
To compile this driver as a module, choose M here: the module will be
called wavelan_cs. If unsure, say N.
+config STRIP
+ tristate "STRIP (Metricom starmode radio IP)"
+ depends on INET && WLAN_PRE80211
+ select WIRELESS_EXT
+ ---help---
+ Say Y if you have a Metricom radio and intend to use Starmode Radio
+ IP. STRIP is a radio protocol developed for the MosquitoNet project
+ (on the WWW at <http://mosquitonet.stanford.edu/>) to send Internet
+ traffic using Metricom radios. Metricom radios are small, battery
+ powered, 100kbit/sec packet radio transceivers, about the size and
+ weight of a cellular telephone. (You may also have heard them called
+ "Metricom modems" but we avoid the term "modem" because it misleads
+ many people into thinking that you can plug a Metricom modem into a
+ phone line and use it as a modem.)
+
+ You can use STRIP on any Linux machine with a serial port, although
+ it is obviously most useful for people with laptop computers. If you
+ think you might get a Metricom radio in the future, there is no harm
+ in saying Y to STRIP now, except that it makes the kernel a bit
+ bigger.
+
+ To compile this as a module, choose M here: the module will be
+ called strip.
+
config PCMCIA_NETWAVE
tristate "Xircom Netwave AirSurfer Pcmcia wireless support"
depends on PCMCIA && WLAN_PRE80211
@@ -100,7 +100,6 @@ config PCMCIA_NETWAVE
To compile this driver as a module, choose M here: the module will be
called netwave_cs. If unsure, say N.
-
menuconfig WLAN_80211
bool "Wireless LAN (IEEE 802.11)"
depends on NETDEVICES
@@ -509,28 +508,6 @@ config USB_ZD1201
endif # ZYDAS_80211
-config PCMCIA_RAYCS
- tristate "Aviator/Raytheon 2.4GHz wireless support"
- depends on PCMCIA && WLAN_80211
- select WIRELESS_EXT
- ---help---
- Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
- (PC-card) wireless Ethernet networking card to your computer.
- Please read the file <file:Documentation/networking/ray_cs.txt> for
- details.
-
- To compile this driver as a module, choose M here: the module will be
- called ray_cs. If unsure, say N.
-
-config PCMCIA_WL3501
- tristate "Planet WL3501 PCMCIA cards"
- depends on EXPERIMENTAL && PCMCIA && WLAN_80211
- select WIRELESS_EXT
- ---help---
- A driver for WL3501 PCMCIA 802.11 wireless cards made by Planet.
- It has basic support for Linux wireless extensions and initial
- micro support for ethtool.
-
config ADM8211
tristate "ADMtek ADM8211 support"
depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
@@ -558,8 +535,30 @@ config ADM8211
Thanks to Infineon-ADMtek for their support of this driver.
-source "drivers/net/wireless/hostap/Kconfig"
+config PCMCIA_RAYCS
+ tristate "Aviator/Raytheon 2.4GHz wireless support"
+ depends on PCMCIA && WLAN_80211
+ select WIRELESS_EXT
+ ---help---
+ Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
+ (PC-card) wireless Ethernet networking card to your computer.
+ Please read the file <file:Documentation/networking/ray_cs.txt> for
+ details.
+
+ To compile this driver as a module, choose M here: the module will be
+ called ray_cs. If unsure, say N.
+
source "drivers/net/wireless/orinoco/Kconfig"
+source "drivers/net/wireless/hostap/Kconfig"
+
+config PCMCIA_WL3501
+ tristate "Planet WL3501 PCMCIA cards"
+ depends on EXPERIMENTAL && PCMCIA && WLAN_80211
+ select WIRELESS_EXT
+ ---help---
+ A driver for WL3501 PCMCIA 802.11 wireless cards made by Planet.
+ It has basic support for Linux wireless extensions and initial
+ micro support for ethtool.
config USB_NET_RNDIS_WLAN
tristate "Wireless RNDIS USB support"
--
1.6.2.5
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox