aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-02-25 12:02:45 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-02-26 16:59:11 -0500
commitcaf66e581172dc5032bb84841a91bc7b77ad9876 (patch)
tree6964b20056382eb69667eb35ad3b0fa7fc268221 /include
parentb446918b77c717a34eaa853dfab55f579d330551 (diff)
netdevice.h: check for CONFIG_WLAN instead of CONFIG_WLAN_80211
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
Diffstat (limited to 'include')
-rw-r--r--include/linux/netdevice.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a3fccc85b1a0..99914e6fa3fd 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -136,7 +136,7 @@ static inline bool dev_xmit_complete(int rc)
136 * used. 136 * used.
137 */ 137 */
138 138
139#if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) 139#if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
140# if defined(CONFIG_MAC80211_MESH) 140# if defined(CONFIG_MAC80211_MESH)
141# define LL_MAX_HEADER 128 141# define LL_MAX_HEADER 128
142# else 142# else