[patch 069/123] netdevice.h: check for CONFIG_WLAN instead of CONFIG_WLAN_80211
in [Kernel]
|
Prev: [patch 060/123] p54pci: handle dma mapping errors
Next: [patch 036/123] oprofile: remove tracing build dependency
From: Greg KH on 12 Mar 2010 20:30 2.6.33-stable review patch. If anyone has any objections, please let me know. ----------------- From: John W. Linville <linville(a)tuxdriver.com> commit caf66e581172dc5032bb84841a91bc7b77ad9876 upstream. 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(a)tuxdriver.com> Reported-by: Christoph Egger <siccegge(a)stud.informatik.uni-erlangen.de> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- include/linux/netdevice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -136,7 +136,7 @@ static inline bool dev_xmit_complete(int * 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |