From 6a34f3e31c9157c6a215a4812188f615b9ab9338 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 12 May 2008 20:17:33 -0700
Subject: [PATCH] --- yaml --- r: 96563 b: refs/heads/master c:
 8388e3da34edb141362bb42811ee487dfec15525 h: refs/heads/master i:   96561:
 b205f8ebc1a06f75b76d3781fc7255cfb9a0849b   96559:
 969b151800577f720d5b452a67dc55f7c56a6062 v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/netdevice.h | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 97b240c47cc6..11191d107588 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f403ede70518c131ba8bebbacaf182927a58a315
+refs/heads/master: 8388e3da34edb141362bb42811ee487dfec15525
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 746901774d49..a3fb57fde623 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -93,14 +93,16 @@ struct wireless_dev;
  *	used.
  */
  
-#if !defined(CONFIG_AX25) && !defined(CONFIG_AX25_MODULE) && !defined(CONFIG_TR)
-#define LL_MAX_HEADER	32
+#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)
+# define LL_MAX_HEADER 48
 #else
-#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
-#define LL_MAX_HEADER	96
-#else
-#define LL_MAX_HEADER	48
-#endif
+# define LL_MAX_HEADER 32
 #endif
 
 #if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \