Question about WLAN_80211 removal

Question about WLAN_80211 removal

[Christoph Egger]

Hi all!

	As part of the VAMOS[0] research project at the University of
Erlangen we're checking referential integrity between kernel KConfig
options and in-code Conditional blocks.

	In git commit [1] the option WLAN_80211 was removed as well as
all references from within KConfig (as far as I can see) because the
non 80211 drivers moved to staging.

	I guess while doing so the help message was beliefed in which
tells that this option only enables selection of certain drivers which
is unfortunately wrong as this option is used in one header file[2]
where it influences (as I'm reading it) the maximum size required for
some networking header.	Is this, as it seems, a bug in kernel code or
rather harmless (intended?)?

Regards

	Christoph Egger

[0] http://vamos1.informatik.uni-erlangen.de/
[1] 133d7c6a504c672011ebc24b26e05b15f7410c07
[2] ./include/linux/netdevice.h
#if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
# if defined(CONFIG_MAC80211_MESH)
#  define LL_MAX_HEADER 128
# else
#  define LL_MAX_HEADER 96
# endif
#elif defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)
# define LL_MAX_HEADER 48
#else
# define LL_MAX_HEADER 32
#endif

[PATCH] netdevice.h: check for CONFIG_WLAN instead of CONFIG_WLAN_80211

[John W. Linville]

In "wireless: remove WLAN_80211 and WLAN_PRE80211 from Kconfig" I
inadvertantly missed a line in include/linux/netdevice.h.  I thereby
effectively reverted "net: Set LL_MAX_HEADER properly for wireless." by
accident. :-(  Now we should check there for CONFIG_WLAN instead.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Reported-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Cc: stable@kernel.org
---
Unless there is objection, I'll push this up through my tree as normal.

 include/linux/netdevice.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a3fccc8..99914e6 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -136,7 +136,7 @@ static inline bool dev_xmit_complete(int rc)
  *	used.
  */
 
-#if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+#if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 # if defined(CONFIG_MAC80211_MESH)
 #  define LL_MAX_HEADER 128
 # else
-- 
1.6.2.5

[PATCH] netdevice.h: check for CONFIG_WLAN instead of CONFIG_WLAN_80211

[John W. Linville]

In "wireless: remove WLAN_80211 and WLAN_PRE80211 from Kconfig" I
inadvertantly missed a line in include/linux/netdevice.h.  I thereby
effectively reverted "net: Set LL_MAX_HEADER properly for wireless." by
accident. :-(  Now we should check there for CONFIG_WLAN instead.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Reported-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Cc: stable@kernel.org
---
Unless there is objection, I'll push this up through my tree as normal.

(Apologies for the second copy, I munged the LKML address in the first
one...)

 include/linux/netdevice.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a3fccc8..99914e6 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -136,7 +136,7 @@ static inline bool dev_xmit_complete(int rc)
  *	used.
  */
 
-#if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+#if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 # if defined(CONFIG_MAC80211_MESH)
 #  define LL_MAX_HEADER 128
 # else
-- 
1.6.2.5

Re: [PATCH] netdevice.h: check for CONFIG_WLAN instead of CONFIG_WLAN_80211

[David Miller]

From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 25 Feb 2010 11:49:49 -0500

> In "wireless: remove WLAN_80211 and WLAN_PRE80211 from Kconfig" I
> inadvertantly missed a line in include/linux/netdevice.h.  I thereby
> effectively reverted "net: Set LL_MAX_HEADER properly for wireless." by
> accident. :-(  Now we should check there for CONFIG_WLAN instead.
> 
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> Reported-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
> Cc: stable@kernel.org
> ---
> Unless there is objection, I'll push this up through my tree as normal.

Definitely no objections :-)