[PATCH 0/7] wireless: few kconfig updates

[PATCH 0/7] wireless: few kconfig updates

[Luis R. Rodriguez]

Since it seems the organizational changes on kconfig for wireless
drivers did not go through I am sending now only the net/wireless and
net/mac80211 wireless kconfig updates. This updates the description of
the wireless options to reflect better with our documentation on
wireless.kernel.org and we also provide pointers for further
documentation.

Luis R. Rodriguez (7):
  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: remove mac80211 rate selection extra menu

 drivers/net/wireless/Kconfig |   13 +++++++++++--
 net/Kconfig                  |    8 +++++++-
 net/mac80211/Kconfig         |   24 ++++++++++++++++++------
 net/wireless/Kconfig         |   27 ++++++++++++++++++++++++---
 4 files changed, 60 insertions(+), 12 deletions(-)

[PATCH 1/7] 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 dda7cc2..1e45444 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)"
@@ -506,4 +515,4 @@ source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/wl12xx/Kconfig"
 source "drivers/net/wireless/iwmc3200wifi/Kconfig"
 
-endmenu
+endif # WLAN
-- 
1.6.3.3

[PATCH 2/7] 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.3.3

Re: [PATCH 2/7] wireless: update wireless kconfig description

[Johannes Berg]

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

On Tue, 2009-09-01 at 08:22 -0700, Luis R. Rodriguez wrote:
> "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"

But this also has WEXT under it which supports pre-802.11 technologies,
no? Might not matter at this point though.

johannes

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

Re: [PATCH 2/7] wireless: update wireless kconfig description

[Luis R. Rodriguez]

On Tue, Sep 01, 2009 at 08:31:36AM -0700, Johannes Berg wrote:
> On Tue, 2009-09-01 at 08:22 -0700, Luis R. Rodriguez wrote:
> > "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"
> 
> But this also has WEXT under it which supports pre-802.11 technologies,
> no? 

Heh yeah, good point.

> Might not matter at this point though.

Probably not, its more 802.11 than pre now.

  Luis

[PATCH 3/7] 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 |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index aea7e68..9fd570b 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -1,6 +1,15 @@
 config CFG80211
-	tristate "Improved wireless configuration API"
+	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.
+
+	  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
 
 config NL80211_TESTMODE
 	bool "nl80211 testmode command"
-- 
1.6.3.3

Re: [PATCH 3/7] wireless: update cfg80211 kconfig entry

[Larry Finger]

Luis R. Rodriguez wrote:
> 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 |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)
> 
> diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
> index aea7e68..9fd570b 100644
> --- a/net/wireless/Kconfig
> +++ b/net/wireless/Kconfig
> @@ -1,6 +1,15 @@
>  config CFG80211
> -	tristate "Improved wireless configuration API"
> +	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.
> +
> +	  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

First of all, I think this modest change is much better than the
previous set of patches, and that the additional info you provide for
mac80211 and friends will be useful for those who don't live with
802.11 wifi all day long.

That said, I find the above statement to be a little clumsy. Perhaps
it should be "When built as a module, it will be called cfg80211". The
same comment also applies to patch 6 for mac80211.

Larry

Re: [PATCH 3/7] wireless: update cfg80211 kconfig entry

[Luis R. Rodriguez]

On Tue, Sep 01, 2009 at 08:37:12AM -0700, Larry Finger wrote:
> Luis R. Rodriguez wrote:
> > 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 |   11 ++++++++++-
> >  1 files changed, 10 insertions(+), 1 deletions(-)
> >
> > diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
> > index aea7e68..9fd570b 100644
> > --- a/net/wireless/Kconfig
> > +++ b/net/wireless/Kconfig
> > @@ -1,6 +1,15 @@
> >  config CFG80211
> > -     tristate "Improved wireless configuration API"
> > +     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.
> > +
> > +       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
> 
> First of all, I think this modest change is much better than the
> previous set of patches, and that the additional info you provide for
> mac80211 and friends will be useful for those who don't live with
> 802.11 wifi all day long.
> 
> That said, I find the above statement to be a little clumsy. Perhaps
> it should be "When built as a module, it will be called cfg80211". The
> same comment also applies to patch 6 for mac80211.

Thanks, will resend.

  Luis

[PATCH 4/7] 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 9fd570b..08f6733 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -49,6 +49,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.3.3

[PATCH 5/7] 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 08f6733..521ef6a 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -98,8 +98,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.3.3

Re: [PATCH 5/7] wireless: update WIRELESS_EXT kconfig entry

[Larry Finger]

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 08f6733..521ef6a 100644
> --- a/net/wireless/Kconfig
> +++ b/net/wireless/Kconfig
> @@ -98,8 +98,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 would like this to read "You will need this if you have old
userspace utilities or old wireless devices that have not yet been
ported to cfg80211."

Larry

Re: [PATCH 5/7] wireless: update WIRELESS_EXT kconfig entry

[Johannes Berg]

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

On Tue, 2009-09-01 at 10:53 -0500, Larry Finger wrote:

> > @@ -98,8 +98,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 would like this to read "You will need this if you have old
> userspace utilities or old wireless devices that have not yet been
> ported to cfg80211."

Don't those "select WIRELESS_EXT" anyway so you don't have a choice?

johannes

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

Re: [PATCH 5/7] wireless: update WIRELESS_EXT kconfig entry

[John W. Linville]

On Tue, Sep 01, 2009 at 05:54:43PM +0200, Johannes Berg wrote:
> On Tue, 2009-09-01 at 10:53 -0500, Larry Finger wrote:
> 
> > > @@ -98,8 +98,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 would like this to read "You will need this if you have old
> > userspace utilities or old wireless devices that have not yet been
> > ported to cfg80211."
> 
> Don't those "select WIRELESS_EXT" anyway so you don't have a choice?

Old userland won't do that.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

[PATCH 6/7] 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 |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 9db4ff8..72006f9 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,21 @@ 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.
+
+	  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, if not sure
+	  you should build this as a module.
 
 comment "CFG80211 needs to be enabled for MAC80211"
 	depends on CFG80211=n
-- 
1.6.3.3

[PATCH 7/7] 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 72006f9..8300d19 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -26,8 +26,7 @@ config MAC80211
 comment "CFG80211 needs to be enabled for MAC80211"
 	depends on CFG80211=n
 
-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
@@ -74,7 +73,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.3.3